Remove test crap out of scope.js for #2