Awood/rspec improvements

Don't leave a bunch of trash lying around in the database and on the filesystem after running RSpec tests.