[JBJCA-1126] ConnectorTestCase should import both packages
[JBJCA-1127] Minimize locking duration on cls