Added testCleanUp