Added some basic tests, removed extraneous json methods
Merge branch 'generic-model' of https://github.com/slash-slash-no-comment-WPI-cs3733/wpi-suite into generic-model