Unit tests

Change-Id: I77b827919562cad862cf6c118a524c38494869cf