CFY-660 fixed rest service unit tests