Fixed failing test timing out on overnight builder

Change-Id: I450c0c6b1ccfbd13a9eacf51f0fea2aa0f1b2268

Conflicts:
	Build/FwBuildTasks.dllI'm