Unit tests

Change-Id: Id461f28e5016d1fd48567c429102c32b4cfbae4d