Activity 4 - Code simplification and adjustments

Simplification applied on DoneServiceControllerTest, Admistrative and
APB.