Add new tests for multiple matches and raise SkipTest on failing tests