Extole integration--cleaned up tests and made a few minor fixes

Made a few slight fixes and cleaned up the spacing on the test suite.
To DRY this up, break L84-90 out into a helper function