Minor cleanup for unit test code