Unit tests

Change-Id: I081b34027c320b737c3221e1ef9c390a7b8aec07