Unit tests

Change-Id: Idd06f4c70dbe7be1048c6c599ace4b585403a9dc