Fixed up additional failing charref tests.