Unit tests

Change-Id: I36552a70daa67cf73f026af70fe65595629eb69b