Remove test on obsolete methods
Account for Unicode form