Unit tests

Change-Id: Icaed2e287b59edffd3cf163ea1cded67ac1edbed