Fix resolver-tests