Remove deprecated `scope` use without passing a callable object.

Removed tests from deprecated code.