un-commenting tests in datamanager/tests/service_test.cc + reflect datamanager changes to the tests