Fix retrieval unit tests.

Change-Id: I299b71406b59539230e5182ccc37bc8a83af60b3