LOW: fixing additional issues with connector dependencies
LOW: fixed Viewpoint for unit-tests