Imrove tests