Change JSON marshaling and unmarshaling tests to use subtests for cleaner separation in output as well as for easier visual scanning.