Test case fixes.

Change-Id: Ifdd70f2a6b71175c3b64a563525889788837cfb8