Make cps-selectors command take a real typeface
Make naming of selectors argument more consistent
Reorganize test data

Use fonts with just the glyphs P, A, N for speed.