Attempt to fix the psql issues with tests