QA: update RSpec assertions for modern syntax

Also add assertions properly to Then steps

Change-Id: I12a6b73d9dec7c81187ae8a0ec34bc1fde465ace
Merge "QA: update RSpec assertions for modern syntax"