3418 Change scope, add test