Unit tests

Change-Id: I79fbf11bd8c6443c0a5d32c47743e34a68944b7e