Progress: Remove unnecessary combining tests.

Progress: Remove unnecessary combining tests.

These tests are now handled using the same unit test.
The object reads and content reads directly depend on each other.
Rather than trying to ignore this, use both so that the states can be better tested and the unit test code is simpler to write.
This turns out to be better at catching problems.