Unit tests

Change-Id: Ib57b2f597b0591762e691890bf1340f2a7fe1ad9