Unit tests

Change-Id: If793c7f1f1bfdea9dd7294e82305e8cd9f50c00b