diff --git a/rowers/templates/fusion.html b/rowers/templates/fusion.html
index d5185cf8..fda02288 100644
--- a/rowers/templates/fusion.html
+++ b/rowers/templates/fusion.html
@@ -25,7 +25,7 @@
   </li>
   <li class="grid_2">
     <p>
-      Adding sensor data from workout {{ workout2.id }} into workout {{ workout1.id }}.
+      Adding sensor data from workout {{ workout2.id|encode }} into workout {{ workout1.id|encode }}.
       This will create a new workout. After you submit the form, you will be
       taken to the newly created workout. If you are happy with the result, you
       can delete the two original workouts manually.
diff --git a/rowers/templates/fusion_list.html b/rowers/templates/fusion_list.html
index 84cb64d5..159b9003 100644
--- a/rowers/templates/fusion_list.html
+++ b/rowers/templates/fusion_list.html
@@ -41,7 +41,7 @@
     </p>
     <p>
       <form enctype="multipart/form-data" action="/rowers/workout/fusion/{{ id }}/" method="post">
-        
+
         <table>
           {{ dateform.as_table }}
         </table>
@@ -71,11 +71,11 @@
         </a>
         {% endif %}
         {% endif %}
-        
+
         <span>
           Page {{ workouts.number }} of {{ workouts.paginator.num_pages }}.
         </span>
-        
+
         {% if workouts.has_next %}
         {% if request.GET.q %}
         <a href="?page={{ workouts.next_page_number }}&q={{ request.GET.q }}">
@@ -124,9 +124,9 @@
 	  {% if id == cworkout.id %}
 	  <td>&nbsp;</td>
 	  {% else %}
-	  <td> <a class="button blue small" href="/rowers/workout/fusion/{{ id }}/{{ cworkout.id|encode }}">Fusion</a> </td>
+	  <td> <a href="/rowers/workout/fusion/{{ id }}/{{ cworkout.id|encode }}">Fusion</a> </td>
 	  {% endif %}
-          
+
 	</tr>
 	{% endfor %}
       </tbody>
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
deleted file mode 100644
index dc37faec..00000000
Binary files a/rowers/tests/testdata/testdata.tcx.gz and /dev/null differ