Some new tests, and I broke up some long sets of cases into single tests too.