Merge "Cleanup test jobs better"