fix tests that error/fail on nix/hydra, refactor unicode a bit
Merge pull request #20 from matejc/fixingtests

fix tests that error/fail on nix/hydra, refactor unicode a bit