Fixed bugs
Started working on the unit tests for the json helper