updated templates
fixed class name for test cases, dropped trailing "Case"