Update message to refer to 'scope'.
Cleanup test. Currently failing.