Unit tests

Change-Id: Ie26f092dafe098e49f5e2fa93430e431761550c3