Minor cleanup of unit test code, in preparation for more advanced tests.