Unit tests

Change-Id: If92c3e627f4ff933d1d87766323ef0f41f6660bd