Tiny pep8 fixes.
More grouping tests, working.