BS-6939,BS-936,BS-7481
Clean remaining files after import in tests