Activity 4 - Code simplification and adjustments

DoneServiceDAOTest
ReportDAOTest
ServiceTypeTest