Update templates to fit the new translator
Remove old tests