Further tweaks for cleanup test