Cleanup.
Cleanup content tests.
Merge branch 'develop'