Unit tests

Change-Id: Ia5909b0434a4defe14e254b9e14df4f2aff5d119