Move test data into separate directory
Don't use locale-dependant character classes for matching names