tweak fail test, re-enable Cleanup