Converted all limit/ignore tests to filter equivs + match fix