Jberendes/bugfix/uis2 allow manual scope updating

allow for manual scope updating and resolve testing