QA: alphabetize steps properly

This is an interim step. The next move is to update all the
assertions to use modern RSpec syntax.

Change-Id: I314db3d81ebcda1a576ef8c9859cecd67667c958
Merge "QA: alphabetize steps properly"