Added tests for context handling
bump
Merge branch 'release/v0.1.12' into develop