Add scope and test