Unit tests

Change-Id: I5330003ccaf52acd7c7b4f848d096e8aa8c640dd
Unit tests

Change-Id: Idb91bd2bc8cfbd8937cd881118b2a1a8fc8c77d4