Update Rspec, PG & test fixes