Unit tests

Change-Id: I513562c2c3b5d765eb161848979500372732f059