Unit tests

Change-Id: Iadf7b70d05e51cfd7118e67c6decdda500ff359d