LOW: trying to fix Viewpoints used in integration-tests - WiP