tests passing after validation refactor