Fix for issue with wstrings.
More test corrections.