PostgreSQL Test improved