More context tests with fixes