Unit tests

Change-Id: I9d840cf1dff41a4ac980e1924156123bf47ae06a