Refactors cucumber tests #104