Added some more tests and updated some validation