Fix broken tests caused by new ctx support
Fix contexts for realsies
Merge pull request #11 from TronPaul/master

Nightly Pull