Fix test on scope. Fix imports. Removed deprecated test.