diff --git a/tests/Fixtures/TwoVisitsWithCustomVariables.php b/tests/Fixtures/TwoVisitsWithCustomVariables.php
index 47e8517..50738bb 100644
--- a/tests/Fixtures/TwoVisitsWithCustomVariables.php
+++ b/tests/Fixtures/TwoVisitsWithCustomVariables.php
@@ -151,7 +151,10 @@ private function trackVisits()
         $visitorB->setCustomVariable($id = 2, $name = 'Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz', $value = 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz');
         $visitorB->setCustomVariable($id = -2, $name = 'not tracked', $value = 'not tracked');
         $visitorB->setCustomVariable($id = 6, $name = 'not tracked', $value = 'not tracked');
-        $visitorB->setCustomVariable($id = 6, $name = array('not tracked'), $value = 'not tracked');
+        // A custom variable with a non-string (array) name can no longer go through the
+        // type-safe setCustomVariable(); inject it straight into the cvar payload so we
+        // still verify a malformed custom variable is not tracked.
+        $visitorB->visitorCustomVar[6] = array(array('not tracked'), 'not tracked');
         $visitorB->setUrl('http://example.org/homepage');
         self::checkResponse($visitorB->doTrackGoal($idGoal, 1000));
 
diff --git a/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 6c96324..56c2277 100644
--- a/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -157,8 +157,8 @@
 				
 				<pageId>46</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -556,8 +556,8 @@
 				
 				<pageId>41</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -945,8 +945,8 @@
 				
 				<pageId>35</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -1376,8 +1376,8 @@
 				
 				<pageId>30</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -1756,8 +1756,8 @@
 				
 				<pageId>24</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -2164,8 +2164,8 @@
 				
 				<pageId>80</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -2409,8 +2409,8 @@
 				
 				<pageId>19</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -2980,8 +2980,8 @@
 				
 				<pageId>74</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -3212,8 +3212,8 @@
 				
 				<pageId>13</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -3770,8 +3770,8 @@
 				
 				<pageId>91</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -3991,8 +3991,8 @@
 				
 				<pageId>69</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -4204,8 +4204,8 @@
 				
 				<pageId>58</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -4425,8 +4425,8 @@
 				
 				<pageId>8</pageId>
 				<bandwidth />
-				<timeSpent>1621</timeSpent>
-				<timeSpentPretty>27 min 1s</timeSpentPretty>
+				<timeSpent>1620</timeSpent>
+				<timeSpentPretty>27 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -5318,8 +5318,8 @@
 				
 				<pageId>85</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -5590,8 +5590,8 @@
 				
 				<pageId>63</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -5854,8 +5854,8 @@
 				
 				<pageId>52</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>
@@ -6126,8 +6126,8 @@
 				
 				<pageId>2</pageId>
 				<bandwidth />
-				<timeSpent>1623</timeSpent>
-				<timeSpentPretty>27 min 3s</timeSpentPretty>
+				<timeSpent>360</timeSpent>
+				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<pageviewPosition>1</pageviewPosition>
 				<title>Space Quest XII</title>
 				<subtitle>http://piwik.net/space/quest/iv</subtitle>