Improve context tests.