Fix failing specs due to rspec update
Scratch that, don't add another dep
Bump version to 3.8.0
Minor refactor