CppUnit wstring fix wrap-up.

Some tests were missing the fix.
Also, moved the #include from .hpp to .cpp for previously fixed tests.
Tracker item 3671.