Refactored cukes after code review
Refactored spec and bomb after code review

Spec could probably be further refactored