Cleaning up the JSON and Parameter objects as well as their unit tests.