Unit tests

Change-Id: Ibdc64eb30f6ee627809938b5a6aa1f03a98cc35d