Added/checked template tests

Change-Id: I2fa27905cc7662426cd2c36960298b09d96eca7f
Closes-Bug: #1318011
Merge "Added/checked template tests"