Do refactoring spec files @3100