content tests and refactoring