Improve testability of DataService for CUD operations