Added json parser, added json parser test class, cleaned up some other code