Unit tests

Change-Id: Ie9961b624574502a70682905acd87437a6a2d63d