feature specs refactored to use helper methods
merge conflicts resolved