Remove unused dao calls
Add mockito tests