Unit tests

Change-Id: I2e8862d36fa33e7c7dc43c54ae106ee6b7f8b830