Refactor tests

Remove cluttering and move content type creation to the test to speed up execution time.