Reorganize validators and split tests files