Unit tests

Change-Id: Ic4fe64d5316d05c07a07fb219a9b8734c2e4af0f