Cleanups in test cases