Test input values ​​improved