Added some tests
Added some more tests and fixed json decode utility function
Added some more tests