5469

Testes improved and coverage set to 78%