Unit tests

Change-Id: Iee27586bfafd3196c92eb23548aa659d6a3acf23