Mass test cleanup