imporved tests