Unit tests

Change-Id: I4aaf24355af7f251d851268016134bcc895d62e1