Fix up various confusions in test.