Unit tests

Change-Id: Ia0ec30e21d584246c809ac127d6d209c05bead3b