Resolver tests / bugfixes