Updated unit tests to cover cds API