Add Tests

Adds tests. Increases test coverage from 30% to 70% :smile_cat: 
Do we need to make this `Boolean` in case the properties are null?