tests fixed, separators converted