Before adding testFilter
Added many more tests