Tidy up and rename the new test helpers

Rename the test helpers added in #111 and rename some variables which still have remnants of the 'section' coupling.

For @fatbusinessman.