Unit tests

Change-Id: I9f8803a967b766a440130aeaf761a23967a9e652