Add tests for content and resultant fixes.