add tests
conflito resolvido