Merge "Modify test templates to prepare for stage 3 algorithm." into pi-dev am: 82aa849093 am: 92f6aa5f7c
am: 459e556047

Change-Id: I1a84ed834195b619a71c8dfda665e6cb45a0b458