Order steps by Given-When-Then

Change-Id: I4806861b96c1352b0348e9125e4d5fab68a7be2f
Merge "Order steps by Given-When-Then"