MAJOR test refactor

There should be more coming, but this helps us get to a more standard
rspec layout. I'm also hoping this stops the 2.0.0 test failures.