Imporve testing flow