Fix the step definitions and scenarios, disable tests until \` error is fixed