Unit tests

Change-Id: I9109103439cb128950d36918cc9d84699aa21269