Unit tests

Change-Id: Ia17c331697bb90dc38f10edb5fdab67162a9bcad