Some test fixes
Adds test environments for psycopg2 2.5.1