Fixt test
Unicode fixes... Not the best :*(