Revised the test JSON to match the recent changes.
Updated the loader to parse the new way ResourceJSON files are stored.
Updated resources/collections to handle the updated JSON.