Fix jst templates' name collision
update tests
Fix test cases' name collision