Unit tests

Change-Id: Ibd98e2b62448e26cfeabdaea9360671439bf8c88