Enhance/add some testes