Update unit tests for json upstream changes