[V1S2 US14] Fix unit test
Merge branch 'REST'