Adding tests
Added some validation (need to do this for all objects) and updated some testing