Cleanup: JsonCreator, test logging output, resource class names