Clean up step defs, reword steps to match