Added/checked template tests

Change-Id: I23628a45fe41f38ab3d8d9ac312bb82d3973490c
Closes-Bug: #1312172