Unit tests

Change-Id: I717822a2881c0210c5bae859c5e9c266752e6b46