Imporved tests