Merge "unittests for DatabaseConnectionPool (and fix bugs)"