QA: more updates for modern rspec

Change-Id: Ia577e88a6c8e31c07c64194fe29dbd7967b5f0f5