Fixes and tests for resolver