Double the cleanup gap from tests
Remove ugly debugging hack