Update the tests to support JSON serialization