un-commenting tests in datamanager/tests/service_test.cc + reflect datamanager changes to the tests
minor change
Merge pull request #57 from mmoadeli/MAID-484

Maid 484