Tests closer to reality
Do not mix command-line arguments with the configuration file ones
Merge branch 'arguments-eaten'
Version bump