Test filtering fix