Tidying up tests so that they are pointed at the processing other than command-line args / config processing which I have decided to bypass in the testing