Some more style updating to match the new segmentIO testing styles.  Also removed a good 250 lines of test code by just doing some refactoring to centralize boilerplate code.