Unit tests

Change-Id: I03816f7be704d8f04e1807c55e4d05dd17cebbb4