Unit tests

Change-Id: I3561721ea566efac727f0cf669667eb8ee9d90fb