Unit tests

Change-Id: I62f67a3fe508ffebd3c8da25b361bed2e945a6c1