Rectified the way scope was handled
Test fixed to reflect new scope handling