Unit tests

Change-Id: I898105c5057760dad21beb97b6f098bf9ff5af74