Update to modern RSpec and simplify with block

Change-Id: I27f7a45751e212f75044dc1d0b1311309696a079