More content tests
More fixes