Return content tests to Header.test(). Merge double-include test with
dependency tests.
Rewrite conflict tester. Hopefully both fast and correct now.