Unit tests

Change-Id: I79c081ff693bcbc0e804c5d8a29323c473f9514d