Restored the filtering but skipped the tricky test