Update and add tests for optional Context