Separate config file. Tests corrections.
Line endings.