Tweak resolverFactory and other stuff, improve related tests.