CFY-972 updated REST service and tests according to DSL changes