Cleaning up unit test machinery