Unit tests

Change-Id: I3ea093a58fbb89ad039c60b1791aa176a916d1c6