Test content level 2 aspects, and fix bug exposed by new tests.

Also refactor some older tests for better coverage.