Unit tests

Change-Id: I2d320a1bc315741aef24ff73e8ea8f131338874f