Updated tests to use new format of localized directories
Merge branch 'pull-request-psr-0'