CARE#7: Added some tests, changed daosa and services function names