Issues/30 fix failing tests

Get the unit tests working. Basically a combination of

1) Inconsistent use of unicode strings.
2) A bad method name (cherry-picked from Hakim)
3) Test data getting out of sync with reality while the tests weren't passing.