Contents test reuse 4

More tweaks made while working through my failed tests from `test_contents_api`.