Unit tests

Change-Id: I44da06deaec6e49d26513fb3b71ed9cc26755ab3