Adjust to recent changes to rspec-puppet