tests refactor. Finished validator tests