Fix broken tests after hasty merge by me

Change-Id: I91e0befe9ef7964cd8f465ee554f4a7f3c4788a8