Refactored tests and rewrote fromjson methods to work correctly.