refactoring specs, #159