Unit tests

Change-Id: Icc1c062f317716d53d7842f45cb178396dd87202