Additional DB and rspec changes