Split connection class into V1 and V2. Unit tests work again.