refactored dao tests, added activity dao tests