Updated with the latest Search and Filtering testing