Fix in conversion filter plus new tests