Unit tests

Change-Id: Iaa086704bd16645de41c7d89b18602b67f2fe8d0