Updated the cucumber scenarios just enough to get them passing.