Fix some naming issues in the unittest am: dd24d5c8b7
am: ad84f6ae5b

Change-Id: I761ab354a3c0d237d8a21e00a0f0c345a3890e5f