Unit tests

Change-Id: If2dddf03d8fa1dd750cb38d82333957e0f32006d