QA: Then statements with no assertions turned to Whens

These are not actually asserting anything. They should be
Whens not Thens.

Also, I want to re-use them in a new test as Whens also.

No change to function at all, this is just language.

Change-Id: I9d230a1d6a9d7407f91b5cf37103f73d9024f579
Merge "QA: Then statements with no assertions turned to Whens"