Change control tests to be JSON based
Change control tests to JSON based
Actually commit the API changes, as described below