Fixes for resolver, added test to fixture