Tidy up and base test improvement

There remains an issue with the temporal functional test failing if ran
with all the other tests - no time right now to investigate, its time
for bed!