change delimiter
fix tests