Added remaining filter types to tests