Imporve tests