Batch test and fix skipping test during cleanup phase