Unit tests

Change-Id: Ia0fe2bf5018029f98914c9f62467c1b8721eb4c2