Remove files of testes and make code more readable