Unit tests

Change-Id: Iaa878fe3d773b06ffed6fdbb2f31e464d7aca57e