Imrpoved tests