Update unit tests with JsonCodec changes

Update unit tests missed as part of 16fd1d30