more fixes in the tests regarding the resolver.