Fix some broken tests

Some test-breaking code snuck its way in. Specifically, one new test was turning on partitioning but not reseting it to its previous state, breaking downstream tests. 

Also, a newer version of rspec was warning about deprecated behaviors in the tests, so I fixed that as well.