Refactored some cucumber step definitions