Fix bad merge conflict resolution
Fix tests to non-ascii characters in factories