Attempt to fix unicode issues
More unicode testing