Unit tests

Change-Id: I33c8e00f7ff0c7580a0900945a21ecb647950d0d