Unit tests

Change-Id: I80cab55799bdf63fa1781dd3ea3ae97a49986a8c