Unit tests

Change-Id: If2e97eb778905c6a2a8eb6c9f117ffac0441a722