Unit tests

Change-Id: I2d872963a8c622163b6aca537e5883a472c12395