mopping up formatting and character escaping issues for test refactor