Updated the tests to keep running with the old-style Topic content type
Merge branch 'master' into new_collection_support