switch to hooks, make the step definition include hooks, replace extra methods with wrapper