Unit tests

Change-Id: Ic5245f93dc46ab1e56c7c68637c9db7e0f6dc787