Small unit test class cleanup.