Unit tests

Change-Id: I4b6079f98d6539485c0bd34bad2da9ca23a20cc9