(Renan) Separando as models e tests