QA: sort steps properly

* do When and Then correctly
* remove cruft
* update for RSpec3

Change-Id: I7fcd0ea86fc14c8c0c7c3232c765c1d5f469a8b0