Unit tests

Change-Id: Ieee2edea43352f5a698af47b4067c17dff21dfab