Fix alternative separator
Refactor unit test