DRYing out some more cucumber scenarios