Bug 6692: improve TyperUtils tests (first pass)