Add a real test template
Nicer field names