Fix some unit test unhappiness.