Refactoring test a bit.  Still getting used to subtest().