Merge "UT for Rest lib"