Nice cleanup, nice way to expand the existing tests.