QA: cleanup, adding "should" to Then steps

Change-Id: Ifec27106e3526d0e233abed7e8770ff82c98b1ae
Merge "QA: cleanup, adding "should" to Then steps"