Added scope + tests