fix broken tests after validator refactoring