Start refactor specs
Refactoring specs complete