Fixing 2.x unittests. Error was with detection of string vs unicode.