Fix broken tests caused by new ctx support