Unit tests

Change-Id: Iefa2f388e1171c32296845b2bc2d4e8e123f9da3