Unit tests

Change-Id: Idd65e87c7baa3ef7d8096d5656d0456fbcfd4236