Unit tests

Change-Id: Ia4c19b24b93b616a6c328f4121f0232aa0b8dda9