Unit tests

Change-Id: I1cb7816586f548b98feeb56f0654c891cc199d5a