Re-jigger testing and building tests to seperate out the cleaning of the...

... config file.