Unit tests

Change-Id: I220558dfce134de3e477eb16eeadcf761024141c