Rspec 3 fixes

This removes the deprecation messages from RSpec 3+. I also took the opportunity to have a little spring clean across the test suite.