Reorganizando as classes de teste