Unit tests

Change-Id: I9816496f18c42fc8dbcb19676ed86ae6e593a8a7