Unit tests

Change-Id: I72a8115681a23e6860dda5bc8096370e87c7c482