Added tests to data service test script. Couple of minor changes to data service for test compliance.
remove silly copyright