Move pre-def steps to step_definitions