[test-refactoring] General clearning