Unit tests

Change-Id: Iece9405780d7fb8ca78b3b1a0d7b52ebd8919ca6