Unit tests

Change-Id: I9dea42cf4d3fa384635999a70c68a3f550adb89a