QA: refactor for modern RSpec

simple refactor

Change-Id: I1183cd2115a71f837c1e40e6624516a5b02b8958
Merge "QA: refactor for modern RSpec"