Unit tests

Change-Id: I99f95f3e6b3be91851460ab0677302fdd6f9c1fb