Small cleanup in tests