*8787* Get unit testing working for psql