DA-58: Applied Paul's recommended refactorings. Properly applied Dagger to all test cases that do not deal with CRUD.
Resolved merge conflicts.