Unit tests

Change-Id: Ie69c8519ac443caf6745da68ab890089d1fc1280