Remove Cucumber.
Add some helper methods.