Test filtering fix
Merge pull request #24 from square/dlubarov.test_filtering_fix

Test filtering fix