refactored step_defs according to Bryans recommendations