Add more testing matrix builds
Fix tests for new version of rspec