Test suite cleanups, part one of many
A bunch of test suite cleanups required for the true fix to #36 (closed). This sits on top of !88 (merged).
A bunch of test suite cleanups required for the true fix to #36 (closed). This sits on top of !88 (merged).