Added toString() for classes used in testing
Added better unit testing for json deserialization