Allow custom separator in autodiscover mode

Adds tests