Add correct Cucumber gems and change a few Cucumber scenarios for readability