more tests
move validators