Unit tests

Change-Id: Id9497ec42b014f806375a3ee58c4aeb72067189b