Updated the ChangeLog again.
Added tests for the auto-detection logic.