Tidied up configuration of test files and their configuration