fix up tests to reflect new glyphs and some minor changes