Adapt for modules name changes and skip unicode tests on Python 3