Merge "Fix tests for handwriting initiator changes" into main