More context tests with fixes
Merge pull request #5 from wagenet/more-context-fixes

More context tests with fixes