little fixes
Remove dataservice test, as it duplicates tests for each implementation