update tests with new Validation refactoring expectations