cleanup-testing.diff
