Review API tests
Merge branch 'master' into tests
Almost done with tests for main content
Merge branch 'tests'