Fixing unit test for context