Updated tests for context