Fix the unittests related to last Context edits