diff --git a/templates/all_tests.cfg.erb b/templates/all_tests.cfg.erb
--- a/templates/all_tests.cfg.erb
+++ b/templates/all_tests.cfg.erb
@@ -1,13 +1,20 @@
 problem do
   num_tests <%= num_testcases %>
-  full_score <%= num_testcases*10 %>
+  full_score <%= num_testruns*10 %>
   time_limit_each <%= options[:time_limit] %>
   mem_limit_each <%= options[:mem_limit] %>
   score_each 10
 
-<% 1.upto(num_testcases) do |i| %>
-  run <%= i %> do
-    tests <%= i %>
+<% tr_num = 0 %>
+<% testrun_info.each do |testrun| %>
+  <% tr_num += 1 %>
+  run <%= tr_num %> do
+    tests <%= (testrun.collect {|testcase| testcase[0]}).join(", ") %>
+    <% if testrun.length==1 %>
+    score 10
+    <% else %>
+    scores 10 <% (testrun.length-1).times do %>,0 <% end %>
+    <% end %>
   end
 <% end %>
 end