Add more inteligent tests