Unit tests

Change-Id: Ia48977c405b805e7a55da70bfce7e0e37d5de69b