Fixed move bug that caused test failures.

Change-Id: Iad368435a7aff88f78aee72133130da307a9e2be