Added test for PostgreSQL 9.3 and minor changes