Fixed dreaded unicode bug (hopefully) added tests reflecting the changes