Fix for data service mocking + cleanup