Unit tests

Change-Id: I950284f1ae807370bd18adc59f9d2070e5328df8