Temporarily removing cleanup for tests