add custom separator
fix tests