Small changes in Connector unit tests