Fix unit tests for new json class