Add specs and simplify Scope.wrap