Tweak creation of config file and layout of some files in tests folder