Improve test for context preservation
Merge pull request #17 from jeromew/tests

Improve test for context preservation