Re-worded Cucumber specs to read a little nicer