Fix tests to also work for PG