Incremental commit
Kill testutil dependency on psycopg2