put all configuration in .conf files
Merge branch 'tests'