*8787* Get unit testing working for psql
*8787* Modernize reference use