More unit tests for DataService