CFY-972 fixed rest service tests