Added more Filter tests and fixed various broken tests