Fluff out grep test suite some more, including lots of things we don't pass yet.