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

Change-Id: Ia84e7c78a23a6ec1207b8aecaec90be94208d483