Simpify template code.
Fix test description.