ConnectorTest checkin (taken from Frank project)