Cleans up some of the tests for orgs and spaces
Cleans up fake CC internals
Uses common MarshalJSON interface for generating JSON objects