Unit tests

Change-Id: Ifb8d7aaec3cc6ad6983c5c519bf295b075508ea3