Unit tests

Change-Id: If2aee29b50961566c1961f4ce61e074d7ba00b0f