CFY-780 tests cleanup