Fix Rspec setup, clean up database settings