Unit tests

Change-Id: I5420c8e05c4a1b1bf328b5f27a8220588c881eff