Adding Filter and associated tests