Update tests to work and pass in pgsql