Fix Filter and comment Test method