Reword and reorder cucumber tests.
Add more step definitions.
Move method to its own helper
Formatting.