Rethink code structure for testing

[MBattagl]

Breaking out as much of the code into small functions will make it easier to use appropriate unit-tests rather than relying on top-level tests.