More typofixes, and a couple of test additions