Fixing failing tests after context rendering refactor