Prettify regression tests
Hackishly merge in Lane's work toward adding groups. Aggressively add string interpolation along the way.