Unit tests

Change-Id: I7a39bc6356ed7cadb8858b6d3b38d8afdf10abbf