fixed tests after scope/ctrl refactor