Unit tests

Change-Id: I620483fc212411af681e1d0d29243cbc256f1ef0