Add the rest of the comparison filters and some tests