Unit tests

Change-Id: I0f7de011f7fcaa3984265372a772519d46b771c1