More work on creating tests for Data Service #3