Unit tests

Change-Id: Ieafee7dc660c4463c52ba29baa32dcaf65646a2d