Unit tests

Change-Id: Iba33c8d1cab64a78a070507ed286a81601bfe9ed