Some refactoring specs