Unit tests

Change-Id: Ifb4a5dc16b8e926df106bd1174ac96bd4935dab8