More unittests

Change-Id: I3f7705be7acd531b215b3b09e4c1155d57d0193a