Improved code coverage of context scoping.