Unit tests

Change-Id: I2e043f5bcb8363857eca2f3461883d3d828c2fbf