Merge "Avoid multiple inheritance in ResolverTest"