Another swing at fixing Postgres tests.