github-147 - update test_locale_filter
resolve merge conflicts
Merge pull request #156 from stupchiy/github-147

github-147 - update test_locale_filter