Make resolver test tool use internal resolver library