QA: update for modern rspec

Change-Id: I4b0e07d7d7c93ca34b26da56196b50c858ad74ea
Merge "QA: update for modern rspec"