Refactored unit scripts using application names