Unit tests

Change-Id: I0b22147ec4f87678ef2bec886fca5c5306d4407c