Added a few new validators and some more tests