Added tests for context