Bug fixes. FilterTest2 added which still needs to be fixed.
One level filtering for FilterTest2 works.
Minor changes before changing the filter class to work with FilterTest2.