Unit tests

Change-Id: I2f9ed2fa95f69f324029dc270b6103a261822c7c