Merge "Drop testing with PostgreSQL"