Unit tests

Change-Id: I2f21d22943f5f82a5be1fc2ba6af14c3034c8ad1