Unit test, unit tests

Change-Id: If6013e6b1f57795ddb403c44d735c1bcb02292b3