Finish refactoring spec