Unit tests

Change-Id: Iaa7fc60d68356805018d0f9a6f6af2434552fd51
Unit tests

Change-Id: Ie53014cc6929ba22ee63a7cd0c14d687c2a6ec07