Possibel fix for failing tests on pgsql