Reordering step definitions