Added unicode tests. Refactored along the way.