some Cucumber and refactoring of Specs