Unit tests

Change-Id: I0b9847ff5c50a4cea939ad312a80eaba4ec4b1ac