Clean up some unit tests.