Reorder steps into Given/When/Then for sanity