Unit tests

Change-Id: I9c8086eeaa3bb140ddbf42eb9007219644469ec6