Added a few new validators and some more tests
Update composer.json
Merge remote-tracking branch 'remotes/superdweebie/master'

Conflicts:
	composer.json