Unit tests

Change-Id: I08e892f91485b555be45976a21a4fa4c725619da