diff --git a/modules/chartingapi/resources/views/interactivityTest.html b/modules/chartingapi/resources/views/interactivityTest.html
index 54454da095..f2f395fc94 100644
--- a/modules/chartingapi/resources/views/interactivityTest.html
+++ b/modules/chartingapi/resources/views/interactivityTest.html
@@ -84,8 +84,8 @@
                 }
             },
             scales: {
-                x: {scaleType: 'continuous', trans: 'linear', domain: [0, null]},
-                yLeft: {scaleType: 'continuous', trans: 'linear', domain: [0, null]},
+                x: {scaleType: 'continuous', trans: 'linear', domain: [0, 630]},
+                yLeft: {scaleType: 'continuous', trans: 'linear', domain: [0, 930]},
                 color: {scaleType: 'discrete', range: LABKEY.vis.Scale.DataspaceColor()},
                 shape: {scaleType: 'discrete', range: LABKEY.vis.Scale.DataspaceShape()}
             },
diff --git a/src/org/labkey/test/tests/ChartingAPITest.java b/src/org/labkey/test/tests/ChartingAPITest.java
index 1894c71418..1c8dd8db32 100644
--- a/src/org/labkey/test/tests/ChartingAPITest.java
+++ b/src/org/labkey/test/tests/ChartingAPITest.java
@@ -224,8 +224,8 @@ private void checkSVGConversion(String svgText, String contentType, String expor
     protected static final String BOX_TWO = "Box Plot Two (Custom)";
     protected static final String BOX_THREE = "Box Plot Three (Custom, Broken)";
 
-    protected static final String SCATTER_ONE_TEXT = "0200400600800100012001400800100012001400160018002000Scatter Plot OneCD4+ (cells/mm3)Lymphs (cells/mm3)Lymphs (cells/mm3): 1222, CD4+ (cells/mm3): -1Lymphs (cells/mm3): 1235, CD4+ (cells/mm3): 1224Lymphs (cells/mm3): 1123, CD4+ (cells/mm3): 772Lymphs (cells/mm3): 1271, CD4+ (cells/mm3): 390Lymphs (cells/mm3): 1169, CD4+ (cells/mm3): 317Lymphs (cells/mm3): 1039, CD4+ (cells/mm3): 271Lymphs (cells/mm3): 1234, CD4+ (cells/mm3): 327Lymphs (cells/mm3): 1080, CD4+ (cells/mm3): 271Lymphs (cells/mm3): 1081, CD4+ (cells/mm3): 567Lymphs (cells/mm3): 882, CD4+ (cells/mm3): 1020Lymphs (cells/mm3): 736, CD4+ (cells/mm3): 1022Lymphs (cells/mm3): 1095, CD4+ (cells/mm3): 1008Lymphs (cells/mm3): 1039, CD4+ (cells/mm3): 1024Lymphs (cells/mm3): 1173, CD4+ (cells/mm3): 801Lymphs (cells/mm3): 1236, CD4+ (cells/mm3): 1005Lymphs (cells/mm3): 1341, CD4+ (cells/mm3): 1192Lymphs (cells/mm3): 1396, CD4+ (cells/mm3): 937Lymphs (cells/mm3): 1431, CD4+ (cells/mm3): 1034Lymphs (cells/mm3): 1372, CD4+ (cells/mm3): 1005Lymphs (cells/mm3): 1481, CD4+ (cells/mm3): 688Lymphs (cells/mm3): 1672, CD4+ (cells/mm3): 764Lymphs (cells/mm3): 1851, CD4+ (cells/mm3): 405Lymphs (cells/mm3): 1722, CD4+ (cells/mm3): 223Lymphs (cells/mm3): 1879, CD4+ (cells/mm3): 843Lymphs (cells/mm3): 2061, CD4+ (cells/mm3): 462Lymphs (cells/mm3): 1974, CD4+ (cells/mm3): 701Lymphs (cells/mm3): 978, CD4+ (cells/mm3): 1390Lymphs (cells/mm3): 974, CD4+ (cells/mm3): 1457Lymphs (cells/mm3): 1160, CD4+ (cells/mm3): 821Lymphs (cells/mm3): 1310, CD4+ (cells/mm3): 517Lymphs (cells/mm3): 1392, CD4+ (cells/mm3): 295Lymphs (cells/mm3): 1523, CD4+ (cells/mm3): 1076Lymphs (cells/mm3): 1464, CD4+ (cells/mm3): 1342Lymphs (cells/mm3): 1615, CD4+ (cells/mm3): 877Lymphs (cells/mm3): 1579, CD4+ (cells/mm3): 475Lymphs (cells/mm3): 1660, CD4+ (cells/mm3): 736Lymphs (cells/mm3): 1768, CD4+ (cells/mm3): 434Lymphs (cells/mm3): 1954, CD4+ (cells/mm3): 272Lymphs (cells/mm3): 1803, CD4+ (cells/mm3): 391Lymphs (cells/mm3): 1848, CD4+ (cells/mm3): 725Lymphs (cells/mm3): 1798, CD4+ (cells/mm3): 459Lymphs (cells/mm3): 1743, CD4+ (cells/mm3): 1182Lymphs (cells/mm3): 1615, CD4+ (cells/mm3): 1493Lymphs (cells/mm3): 1626, CD4+ (cells/mm3): 764Lymphs (cells/mm3): 1747, CD4+ (cells/mm3): 609Lymphs (cells/mm3): 1635, CD4+ (cells/mm3): 625Lymphs (cells/mm3): 1806, CD4+ (cells/mm3): 400Lymphs (cells/mm3): 1952, CD4+ (cells/mm3): 950Lymphs (cells/mm3): 2105, CD4+ (cells/mm3): 916Lymphs (cells/mm3): 1927, CD4+ (cells/mm3): 542Lymphs (cells/mm3): 2049, CD4+ (cells/mm3): 1090Lymphs (cells/mm3): 2108, CD4+ (cells/mm3): 1283Lymphs (cells/mm3): 1802, CD4+ (cells/mm3): 239Lymphs (cells/mm3): 1787, CD4+ (cells/mm3): 266Lymphs (cells/mm3): 1843, CD4+ (cells/mm3): 224Lymphs (cells/mm3): 1780, CD4+ (cells/mm3): 163Lymphs (cells/mm3): 1859, CD4+ (cells/mm3): 432Lymphs (cells/mm3): 2017, CD4+ (cells/mm3): 954Lymphs (cells/mm3): 2185, CD4+ (cells/mm3): 1044Lymphs (cells/mm3): 2054, CD4+ (cells/mm3): 1094Lymphs (cells/mm3): 2085, CD4+ (cells/mm3): 1028Lymphs (cells/mm3): 2099, CD4+ (cells/mm3): 962Lymphs (cells/mm3): 2121, CD4+ (cells/mm3): 652Lymphs (cells/mm3): 1975, CD4+ (cells/mm3): 386Lymphs (cells/mm3): 1870, CD4+ (cells/mm3): 653Lymphs (cells/mm3): 1953, CD4+ (cells/mm3): 530Lymphs (cells/mm3): 1777, CD4+ (cells/mm3): 366Lymphs (cells/mm3): 1830, CD4+ (cells/mm3): 426Lymphs (cells/mm3): 1668, CD4+ (cells/mm3): 360Lymphs (cells/mm3): 1620, CD4+ (cells/mm3): 467Lymphs (cells/mm3): 1752, CD4+ (cells/mm3): 525Lymphs (cells/mm3): 1551, CD4+ (cells/mm3): 351Lymphs (cells/mm3): 1406, CD4+ (cells/mm3): 379Lymphs (cells/mm3): 1397, CD4+ (cells/mm3): 594Lymphs (cells/mm3): 1587, CD4+ (cells/mm3): 513Lymphs (cells/mm3): 1759, CD4+ (cells/mm3): 546Lymphs (cells/mm3): 1686, CD4+ (cells/mm3): 537Lymphs (cells/mm3): 1609, CD4+ (cells/mm3): 279Lymphs (cells/mm3): 1707, CD4+ (cells/mm3): 226Lymphs (cells/mm3): 1141, CD4+ (cells/mm3): 1190Lymphs (cells/mm3): 999, CD4+ (cells/mm3): 757Lymphs (cells/mm3): 937, CD4+ (cells/mm3): 428Lymphs (cells/mm3): 825, CD4+ (cells/mm3): 291Lymphs (cells/mm3): 882, CD4+ (cells/mm3): 154Lymphs (cells/mm3): 949, CD4+ (cells/mm3): 157Lymphs (cells/mm3): 789, CD4+ (cells/mm3): 121Lymphs (cells/mm3): 692, CD4+ (cells/mm3): 108Lymphs (cells/mm3): 791, CD4+ (cells/mm3): 108Lymphs (cells/mm3): 966, CD4+ (cells/mm3): 148Lymphs (cells/mm3): 922, CD4+ (cells/mm3): 101Lymphs (cells/mm3): 965, CD4+ (cells/mm3): 523Lymphs (cells/mm3): 877, CD4+ (cells/mm3): 690Lymphs (cells/mm3): 770, CD4+ (cells/mm3): 681Lymphs (cells/mm3): 784, CD4+ (cells/mm3): 727Lymphs (cells/mm3): 896, CD4+ (cells/mm3): 741Lymphs (cells/mm3): 780, CD4+ (cells/mm3): 451Lymphs (cells/mm3): 970, CD4+ (cells/mm3): 524Lymphs (cells/mm3): 802, CD4+ (cells/mm3): 749Lymphs (cells/mm3): 870, CD4+ (cells/mm3): 539Lymphs (cells/mm3): 821, CD4+ (cells/mm3): 340";
-    protected static final String SCATTER_TWO_TEXT = "0200400600800100012001400800100012001400160018002000Scatter Plot Two (Custom)CD4LymphsLymphs (cells/mm3): 1222, CD4+ (cells/mm3): -1, Gender: MalesLymphs (cells/mm3): 1235, CD4+ (cells/mm3): 1224, Gender: MalesLymphs (cells/mm3): 1123, CD4+ (cells/mm3): 772, Gender: MalesLymphs (cells/mm3): 1271, CD4+ (cells/mm3): 390, Gender: MalesLymphs (cells/mm3): 1169, CD4+ (cells/mm3): 317, Gender: MalesLymphs (cells/mm3): 1039, CD4+ (cells/mm3): 271, Gender: MalesLymphs (cells/mm3): 1234, CD4+ (cells/mm3): 327, Gender: MalesLymphs (cells/mm3): 1080, CD4+ (cells/mm3): 271, Gender: MalesLymphs (cells/mm3): 1081, CD4+ (cells/mm3): 567, Gender: MalesLymphs (cells/mm3): 882, CD4+ (cells/mm3): 1020, Gender: MalesLymphs (cells/mm3): 736, CD4+ (cells/mm3): 1022, Gender: MalesLymphs (cells/mm3): 1095, CD4+ (cells/mm3): 1008, Gender: MalesLymphs (cells/mm3): 1039, CD4+ (cells/mm3): 1024, Gender: MalesLymphs (cells/mm3): 1173, CD4+ (cells/mm3): 801, Gender: MalesLymphs (cells/mm3): 1236, CD4+ (cells/mm3): 1005, Gender: MalesLymphs (cells/mm3): 1341, CD4+ (cells/mm3): 1192, Gender: MalesLymphs (cells/mm3): 1396, CD4+ (cells/mm3): 937, Gender: MalesLymphs (cells/mm3): 1431, CD4+ (cells/mm3): 1034, Gender: MalesLymphs (cells/mm3): 1372, CD4+ (cells/mm3): 1005, Gender: MalesLymphs (cells/mm3): 1481, CD4+ (cells/mm3): 688, Gender: MalesLymphs (cells/mm3): 1672, CD4+ (cells/mm3): 764, Gender: MalesLymphs (cells/mm3): 1851, CD4+ (cells/mm3): 405, Gender: MalesLymphs (cells/mm3): 1722, CD4+ (cells/mm3): 223, Gender: MalesLymphs (cells/mm3): 1879, CD4+ (cells/mm3): 843, Gender: MalesLymphs (cells/mm3): 2061, CD4+ (cells/mm3): 462, Gender: MalesLymphs (cells/mm3): 1974, CD4+ (cells/mm3): 701, Gender: MalesLymphs (cells/mm3): 978, CD4+ (cells/mm3): 1390, Gender: MalesLymphs (cells/mm3): 974, CD4+ (cells/mm3): 1457, Gender: MalesLymphs (cells/mm3): 1160, CD4+ (cells/mm3): 821, Gender: MalesLymphs (cells/mm3): 1310, CD4+ (cells/mm3): 517, Gender: MalesLymphs (cells/mm3): 1392, CD4+ (cells/mm3): 295, Gender: MalesLymphs (cells/mm3): 1523, CD4+ (cells/mm3): 1076, Gender: MalesLymphs (cells/mm3): 1464, CD4+ (cells/mm3): 1342, Gender: MalesLymphs (cells/mm3): 1615, CD4+ (cells/mm3): 877, Gender: MalesLymphs (cells/mm3): 1579, CD4+ (cells/mm3): 475, Gender: MalesLymphs (cells/mm3): 1660, CD4+ (cells/mm3): 736, Gender: MalesLymphs (cells/mm3): 1768, CD4+ (cells/mm3): 434, Gender: MalesLymphs (cells/mm3): 1954, CD4+ (cells/mm3): 272, Gender: MalesLymphs (cells/mm3): 1803, CD4+ (cells/mm3): 391, Gender: MalesLymphs (cells/mm3): 1848, CD4+ (cells/mm3): 725, Gender: MalesLymphs (cells/mm3): 1798, CD4+ (cells/mm3): 459, Gender: MalesLymphs (cells/mm3): 1743, CD4+ (cells/mm3): 1182, Gender: MalesLymphs (cells/mm3): 1615, CD4+ (cells/mm3): 1493, Gender: MalesLymphs (cells/mm3): 1626, CD4+ (cells/mm3): 764, Gender: MalesLymphs (cells/mm3): 1747, CD4+ (cells/mm3): 609, Gender: MalesLymphs (cells/mm3): 1635, CD4+ (cells/mm3): 625, Gender: MalesLymphs (cells/mm3): 1806, CD4+ (cells/mm3): 400, Gender: MalesLymphs (cells/mm3): 1952, CD4+ (cells/mm3): 950, Gender: MalesLymphs (cells/mm3): 2105, CD4+ (cells/mm3): 916, Gender: MalesLymphs (cells/mm3): 1927, CD4+ (cells/mm3): 542, Gender: MalesLymphs (cells/mm3): 2049, CD4+ (cells/mm3): 1090, Gender: MalesLymphs (cells/mm3): 2108, CD4+ (cells/mm3): 1283, Gender: MalesLymphs (cells/mm3): 1802, CD4+ (cells/mm3): 239, Gender: FemalesLymphs (cells/mm3): 1787, CD4+ (cells/mm3): 266, Gender: FemalesLymphs (cells/mm3): 1843, CD4+ (cells/mm3): 224, Gender: FemalesLymphs (cells/mm3): 1780, CD4+ (cells/mm3): 163, Gender: FemalesLymphs (cells/mm3): 1859, CD4+ (cells/mm3): 432, Gender: FemalesLymphs (cells/mm3): 2017, CD4+ (cells/mm3): 954, Gender: FemalesLymphs (cells/mm3): 2185, CD4+ (cells/mm3): 1044, Gender: FemalesLymphs (cells/mm3): 2054, CD4+ (cells/mm3): 1094, Gender: FemalesLymphs (cells/mm3): 2085, CD4+ (cells/mm3): 1028, Gender: FemalesLymphs (cells/mm3): 2099, CD4+ (cells/mm3): 962, Gender: FemalesLymphs (cells/mm3): 2121, CD4+ (cells/mm3): 652, Gender: FemalesLymphs (cells/mm3): 1975, CD4+ (cells/mm3): 386, Gender: FemalesLymphs (cells/mm3): 1870, CD4+ (cells/mm3): 653, Gender: FemalesLymphs (cells/mm3): 1953, CD4+ (cells/mm3): 530, Gender: FemalesLymphs (cells/mm3): 1777, CD4+ (cells/mm3): 366, Gender: FemalesLymphs (cells/mm3): 1830, CD4+ (cells/mm3): 426, Gender: FemalesLymphs (cells/mm3): 1668, CD4+ (cells/mm3): 360, Gender: FemalesLymphs (cells/mm3): 1620, CD4+ (cells/mm3): 467, Gender: FemalesLymphs (cells/mm3): 1752, CD4+ (cells/mm3): 525, Gender: FemalesLymphs (cells/mm3): 1551, CD4+ (cells/mm3): 351, Gender: FemalesLymphs (cells/mm3): 1406, CD4+ (cells/mm3): 379, Gender: FemalesLymphs (cells/mm3): 1397, CD4+ (cells/mm3): 594, Gender: FemalesLymphs (cells/mm3): 1587, CD4+ (cells/mm3): 513, Gender: FemalesLymphs (cells/mm3): 1759, CD4+ (cells/mm3): 546, Gender: FemalesLymphs (cells/mm3): 1686, CD4+ (cells/mm3): 537, Gender: FemalesLymphs (cells/mm3): 1609, CD4+ (cells/mm3): 279, Gender: FemalesLymphs (cells/mm3): 1707, CD4+ (cells/mm3): 226, Gender: FemalesLymphs (cells/mm3): 1141, CD4+ (cells/mm3): 1190, Gender: MalesLymphs (cells/mm3): 999, CD4+ (cells/mm3): 757, Gender: MalesLymphs (cells/mm3): 937, CD4+ (cells/mm3): 428, Gender: MalesLymphs (cells/mm3): 825, CD4+ (cells/mm3): 291, Gender: MalesLymphs (cells/mm3): 882, CD4+ (cells/mm3): 154, Gender: MalesLymphs (cells/mm3): 949, CD4+ (cells/mm3): 157, Gender: MalesLymphs (cells/mm3): 789, CD4+ (cells/mm3): 121, Gender: MalesLymphs (cells/mm3): 692, CD4+ (cells/mm3): 108, Gender: MalesLymphs (cells/mm3): 791, CD4+ (cells/mm3): 108, Gender: MalesLymphs (cells/mm3): 966, CD4+ (cells/mm3): 148, Gender: MalesLymphs (cells/mm3): 922, CD4+ (cells/mm3): 101, Gender: MalesLymphs (cells/mm3): 965, CD4+ (cells/mm3): 523, Gender: MalesLymphs (cells/mm3): 877, CD4+ (cells/mm3): 690, Gender: MalesLymphs (cells/mm3): 770, CD4+ (cells/mm3): 681, Gender: MalesLymphs (cells/mm3): 784, CD4+ (cells/mm3): 727, Gender: MalesLymphs (cells/mm3): 896, CD4+ (cells/mm3): 741, Gender: MalesLymphs (cells/mm3): 780, CD4+ (cells/mm3): 451, Gender: MalesLymphs (cells/mm3): 970, CD4+ (cells/mm3): 524, Gender: MalesLymphs (cells/mm3): 802, CD4+ (cells/mm3): 749, Gender: MalesLymphs (cells/mm3): 870, CD4+ (cells/mm3): 539, Gender: MalesLymphs (cells/mm3): 821, CD4+ (cells/mm3): 340, Gender: MalesFemalesMales";
+    protected static final String SCATTER_ONE_TEXT = "02004006008001000120014008001000120014001600180020002200Scatter Plot OneCD4+ (cells/mm3)Lymphs (cells/mm3)Lymphs (cells/mm3): 1222, CD4+ (cells/mm3): -1Lymphs (cells/mm3): 1235, CD4+ (cells/mm3): 1224Lymphs (cells/mm3): 1123, CD4+ (cells/mm3): 772Lymphs (cells/mm3): 1271, CD4+ (cells/mm3): 390Lymphs (cells/mm3): 1169, CD4+ (cells/mm3): 317Lymphs (cells/mm3): 1039, CD4+ (cells/mm3): 271Lymphs (cells/mm3): 1234, CD4+ (cells/mm3): 327Lymphs (cells/mm3): 1080, CD4+ (cells/mm3): 271Lymphs (cells/mm3): 1081, CD4+ (cells/mm3): 567Lymphs (cells/mm3): 882, CD4+ (cells/mm3): 1020Lymphs (cells/mm3): 736, CD4+ (cells/mm3): 1022Lymphs (cells/mm3): 1095, CD4+ (cells/mm3): 1008Lymphs (cells/mm3): 1039, CD4+ (cells/mm3): 1024Lymphs (cells/mm3): 1173, CD4+ (cells/mm3): 801Lymphs (cells/mm3): 1236, CD4+ (cells/mm3): 1005Lymphs (cells/mm3): 1341, CD4+ (cells/mm3): 1192Lymphs (cells/mm3): 1396, CD4+ (cells/mm3): 937Lymphs (cells/mm3): 1431, CD4+ (cells/mm3): 1034Lymphs (cells/mm3): 1372, CD4+ (cells/mm3): 1005Lymphs (cells/mm3): 1481, CD4+ (cells/mm3): 688Lymphs (cells/mm3): 1672, CD4+ (cells/mm3): 764Lymphs (cells/mm3): 1851, CD4+ (cells/mm3): 405Lymphs (cells/mm3): 1722, CD4+ (cells/mm3): 223Lymphs (cells/mm3): 1879, CD4+ (cells/mm3): 843Lymphs (cells/mm3): 2061, CD4+ (cells/mm3): 462Lymphs (cells/mm3): 1974, CD4+ (cells/mm3): 701Lymphs (cells/mm3): 978, CD4+ (cells/mm3): 1390Lymphs (cells/mm3): 974, CD4+ (cells/mm3): 1457Lymphs (cells/mm3): 1160, CD4+ (cells/mm3): 821Lymphs (cells/mm3): 1310, CD4+ (cells/mm3): 517Lymphs (cells/mm3): 1392, CD4+ (cells/mm3): 295Lymphs (cells/mm3): 1523, CD4+ (cells/mm3): 1076Lymphs (cells/mm3): 1464, CD4+ (cells/mm3): 1342Lymphs (cells/mm3): 1615, CD4+ (cells/mm3): 877Lymphs (cells/mm3): 1579, CD4+ (cells/mm3): 475Lymphs (cells/mm3): 1660, CD4+ (cells/mm3): 736Lymphs (cells/mm3): 1768, CD4+ (cells/mm3): 434Lymphs (cells/mm3): 1954, CD4+ (cells/mm3): 272Lymphs (cells/mm3): 1803, CD4+ (cells/mm3): 391Lymphs (cells/mm3): 1848, CD4+ (cells/mm3): 725Lymphs (cells/mm3): 1798, CD4+ (cells/mm3): 459Lymphs (cells/mm3): 1743, CD4+ (cells/mm3): 1182Lymphs (cells/mm3): 1615, CD4+ (cells/mm3): 1493Lymphs (cells/mm3): 1626, CD4+ (cells/mm3): 764Lymphs (cells/mm3): 1747, CD4+ (cells/mm3): 609Lymphs (cells/mm3): 1635, CD4+ (cells/mm3): 625Lymphs (cells/mm3): 1806, CD4+ (cells/mm3): 400Lymphs (cells/mm3): 1952, CD4+ (cells/mm3): 950Lymphs (cells/mm3): 2105, CD4+ (cells/mm3): 916Lymphs (cells/mm3): 1927, CD4+ (cells/mm3): 542Lymphs (cells/mm3): 2049, CD4+ (cells/mm3): 1090Lymphs (cells/mm3): 2108, CD4+ (cells/mm3): 1283Lymphs (cells/mm3): 1802, CD4+ (cells/mm3): 239Lymphs (cells/mm3): 1787, CD4+ (cells/mm3): 266Lymphs (cells/mm3): 1843, CD4+ (cells/mm3): 224Lymphs (cells/mm3): 1780, CD4+ (cells/mm3): 163Lymphs (cells/mm3): 1859, CD4+ (cells/mm3): 432Lymphs (cells/mm3): 2017, CD4+ (cells/mm3): 954Lymphs (cells/mm3): 2185, CD4+ (cells/mm3): 1044Lymphs (cells/mm3): 2054, CD4+ (cells/mm3): 1094Lymphs (cells/mm3): 2085, CD4+ (cells/mm3): 1028Lymphs (cells/mm3): 2099, CD4+ (cells/mm3): 962Lymphs (cells/mm3): 2121, CD4+ (cells/mm3): 652Lymphs (cells/mm3): 1975, CD4+ (cells/mm3): 386Lymphs (cells/mm3): 1870, CD4+ (cells/mm3): 653Lymphs (cells/mm3): 1953, CD4+ (cells/mm3): 530Lymphs (cells/mm3): 1777, CD4+ (cells/mm3): 366Lymphs (cells/mm3): 1830, CD4+ (cells/mm3): 426Lymphs (cells/mm3): 1668, CD4+ (cells/mm3): 360Lymphs (cells/mm3): 1620, CD4+ (cells/mm3): 467Lymphs (cells/mm3): 1752, CD4+ (cells/mm3): 525Lymphs (cells/mm3): 1551, CD4+ (cells/mm3): 351Lymphs (cells/mm3): 1406, CD4+ (cells/mm3): 379Lymphs (cells/mm3): 1397, CD4+ (cells/mm3): 594Lymphs (cells/mm3): 1587, CD4+ (cells/mm3): 513Lymphs (cells/mm3): 1759, CD4+ (cells/mm3): 546Lymphs (cells/mm3): 1686, CD4+ (cells/mm3): 537Lymphs (cells/mm3): 1609, CD4+ (cells/mm3): 279Lymphs (cells/mm3): 1707, CD4+ (cells/mm3): 226Lymphs (cells/mm3): 1141, CD4+ (cells/mm3): 1190Lymphs (cells/mm3): 999, CD4+ (cells/mm3): 757Lymphs (cells/mm3): 937, CD4+ (cells/mm3): 428Lymphs (cells/mm3): 825, CD4+ (cells/mm3): 291Lymphs (cells/mm3): 882, CD4+ (cells/mm3): 154Lymphs (cells/mm3): 949, CD4+ (cells/mm3): 157Lymphs (cells/mm3): 789, CD4+ (cells/mm3): 121Lymphs (cells/mm3): 692, CD4+ (cells/mm3): 108Lymphs (cells/mm3): 791, CD4+ (cells/mm3): 108Lymphs (cells/mm3): 966, CD4+ (cells/mm3): 148Lymphs (cells/mm3): 922, CD4+ (cells/mm3): 101Lymphs (cells/mm3): 965, CD4+ (cells/mm3): 523Lymphs (cells/mm3): 877, CD4+ (cells/mm3): 690Lymphs (cells/mm3): 770, CD4+ (cells/mm3): 681Lymphs (cells/mm3): 784, CD4+ (cells/mm3): 727Lymphs (cells/mm3): 896, CD4+ (cells/mm3): 741Lymphs (cells/mm3): 780, CD4+ (cells/mm3): 451Lymphs (cells/mm3): 970, CD4+ (cells/mm3): 524Lymphs (cells/mm3): 802, CD4+ (cells/mm3): 749Lymphs (cells/mm3): 870, CD4+ (cells/mm3): 539Lymphs (cells/mm3): 821, CD4+ (cells/mm3): 340";
+    protected static final String SCATTER_TWO_TEXT = "02004006008001000120014008001000120014001600180020002200Scatter Plot Two (Custom)CD4LymphsLymphs (cells/mm3): 1222, CD4+ (cells/mm3): -1, Gender: MalesLymphs (cells/mm3): 1235, CD4+ (cells/mm3): 1224, Gender: MalesLymphs (cells/mm3): 1123, CD4+ (cells/mm3): 772, Gender: MalesLymphs (cells/mm3): 1271, CD4+ (cells/mm3): 390, Gender: MalesLymphs (cells/mm3): 1169, CD4+ (cells/mm3): 317, Gender: MalesLymphs (cells/mm3): 1039, CD4+ (cells/mm3): 271, Gender: MalesLymphs (cells/mm3): 1234, CD4+ (cells/mm3): 327, Gender: MalesLymphs (cells/mm3): 1080, CD4+ (cells/mm3): 271, Gender: MalesLymphs (cells/mm3): 1081, CD4+ (cells/mm3): 567, Gender: MalesLymphs (cells/mm3): 882, CD4+ (cells/mm3): 1020, Gender: MalesLymphs (cells/mm3): 736, CD4+ (cells/mm3): 1022, Gender: MalesLymphs (cells/mm3): 1095, CD4+ (cells/mm3): 1008, Gender: MalesLymphs (cells/mm3): 1039, CD4+ (cells/mm3): 1024, Gender: MalesLymphs (cells/mm3): 1173, CD4+ (cells/mm3): 801, Gender: MalesLymphs (cells/mm3): 1236, CD4+ (cells/mm3): 1005, Gender: MalesLymphs (cells/mm3): 1341, CD4+ (cells/mm3): 1192, Gender: MalesLymphs (cells/mm3): 1396, CD4+ (cells/mm3): 937, Gender: MalesLymphs (cells/mm3): 1431, CD4+ (cells/mm3): 1034, Gender: MalesLymphs (cells/mm3): 1372, CD4+ (cells/mm3): 1005, Gender: MalesLymphs (cells/mm3): 1481, CD4+ (cells/mm3): 688, Gender: MalesLymphs (cells/mm3): 1672, CD4+ (cells/mm3): 764, Gender: MalesLymphs (cells/mm3): 1851, CD4+ (cells/mm3): 405, Gender: MalesLymphs (cells/mm3): 1722, CD4+ (cells/mm3): 223, Gender: MalesLymphs (cells/mm3): 1879, CD4+ (cells/mm3): 843, Gender: MalesLymphs (cells/mm3): 2061, CD4+ (cells/mm3): 462, Gender: MalesLymphs (cells/mm3): 1974, CD4+ (cells/mm3): 701, Gender: MalesLymphs (cells/mm3): 978, CD4+ (cells/mm3): 1390, Gender: MalesLymphs (cells/mm3): 974, CD4+ (cells/mm3): 1457, Gender: MalesLymphs (cells/mm3): 1160, CD4+ (cells/mm3): 821, Gender: MalesLymphs (cells/mm3): 1310, CD4+ (cells/mm3): 517, Gender: MalesLymphs (cells/mm3): 1392, CD4+ (cells/mm3): 295, Gender: MalesLymphs (cells/mm3): 1523, CD4+ (cells/mm3): 1076, Gender: MalesLymphs (cells/mm3): 1464, CD4+ (cells/mm3): 1342, Gender: MalesLymphs (cells/mm3): 1615, CD4+ (cells/mm3): 877, Gender: MalesLymphs (cells/mm3): 1579, CD4+ (cells/mm3): 475, Gender: MalesLymphs (cells/mm3): 1660, CD4+ (cells/mm3): 736, Gender: MalesLymphs (cells/mm3): 1768, CD4+ (cells/mm3): 434, Gender: MalesLymphs (cells/mm3): 1954, CD4+ (cells/mm3): 272, Gender: MalesLymphs (cells/mm3): 1803, CD4+ (cells/mm3): 391, Gender: MalesLymphs (cells/mm3): 1848, CD4+ (cells/mm3): 725, Gender: MalesLymphs (cells/mm3): 1798, CD4+ (cells/mm3): 459, Gender: MalesLymphs (cells/mm3): 1743, CD4+ (cells/mm3): 1182, Gender: MalesLymphs (cells/mm3): 1615, CD4+ (cells/mm3): 1493, Gender: MalesLymphs (cells/mm3): 1626, CD4+ (cells/mm3): 764, Gender: MalesLymphs (cells/mm3): 1747, CD4+ (cells/mm3): 609, Gender: MalesLymphs (cells/mm3): 1635, CD4+ (cells/mm3): 625, Gender: MalesLymphs (cells/mm3): 1806, CD4+ (cells/mm3): 400, Gender: MalesLymphs (cells/mm3): 1952, CD4+ (cells/mm3): 950, Gender: MalesLymphs (cells/mm3): 2105, CD4+ (cells/mm3): 916, Gender: MalesLymphs (cells/mm3): 1927, CD4+ (cells/mm3): 542, Gender: MalesLymphs (cells/mm3): 2049, CD4+ (cells/mm3): 1090, Gender: MalesLymphs (cells/mm3): 2108, CD4+ (cells/mm3): 1283, Gender: MalesLymphs (cells/mm3): 1802, CD4+ (cells/mm3): 239, Gender: FemalesLymphs (cells/mm3): 1787, CD4+ (cells/mm3): 266, Gender: FemalesLymphs (cells/mm3): 1843, CD4+ (cells/mm3): 224, Gender: FemalesLymphs (cells/mm3): 1780, CD4+ (cells/mm3): 163, Gender: FemalesLymphs (cells/mm3): 1859, CD4+ (cells/mm3): 432, Gender: FemalesLymphs (cells/mm3): 2017, CD4+ (cells/mm3): 954, Gender: FemalesLymphs (cells/mm3): 2185, CD4+ (cells/mm3): 1044, Gender: FemalesLymphs (cells/mm3): 2054, CD4+ (cells/mm3): 1094, Gender: FemalesLymphs (cells/mm3): 2085, CD4+ (cells/mm3): 1028, Gender: FemalesLymphs (cells/mm3): 2099, CD4+ (cells/mm3): 962, Gender: FemalesLymphs (cells/mm3): 2121, CD4+ (cells/mm3): 652, Gender: FemalesLymphs (cells/mm3): 1975, CD4+ (cells/mm3): 386, Gender: FemalesLymphs (cells/mm3): 1870, CD4+ (cells/mm3): 653, Gender: FemalesLymphs (cells/mm3): 1953, CD4+ (cells/mm3): 530, Gender: FemalesLymphs (cells/mm3): 1777, CD4+ (cells/mm3): 366, Gender: FemalesLymphs (cells/mm3): 1830, CD4+ (cells/mm3): 426, Gender: FemalesLymphs (cells/mm3): 1668, CD4+ (cells/mm3): 360, Gender: FemalesLymphs (cells/mm3): 1620, CD4+ (cells/mm3): 467, Gender: FemalesLymphs (cells/mm3): 1752, CD4+ (cells/mm3): 525, Gender: FemalesLymphs (cells/mm3): 1551, CD4+ (cells/mm3): 351, Gender: FemalesLymphs (cells/mm3): 1406, CD4+ (cells/mm3): 379, Gender: FemalesLymphs (cells/mm3): 1397, CD4+ (cells/mm3): 594, Gender: FemalesLymphs (cells/mm3): 1587, CD4+ (cells/mm3): 513, Gender: FemalesLymphs (cells/mm3): 1759, CD4+ (cells/mm3): 546, Gender: FemalesLymphs (cells/mm3): 1686, CD4+ (cells/mm3): 537, Gender: FemalesLymphs (cells/mm3): 1609, CD4+ (cells/mm3): 279, Gender: FemalesLymphs (cells/mm3): 1707, CD4+ (cells/mm3): 226, Gender: FemalesLymphs (cells/mm3): 1141, CD4+ (cells/mm3): 1190, Gender: MalesLymphs (cells/mm3): 999, CD4+ (cells/mm3): 757, Gender: MalesLymphs (cells/mm3): 937, CD4+ (cells/mm3): 428, Gender: MalesLymphs (cells/mm3): 825, CD4+ (cells/mm3): 291, Gender: MalesLymphs (cells/mm3): 882, CD4+ (cells/mm3): 154, Gender: MalesLymphs (cells/mm3): 949, CD4+ (cells/mm3): 157, Gender: MalesLymphs (cells/mm3): 789, CD4+ (cells/mm3): 121, Gender: MalesLymphs (cells/mm3): 692, CD4+ (cells/mm3): 108, Gender: MalesLymphs (cells/mm3): 791, CD4+ (cells/mm3): 108, Gender: MalesLymphs (cells/mm3): 966, CD4+ (cells/mm3): 148, Gender: MalesLymphs (cells/mm3): 922, CD4+ (cells/mm3): 101, Gender: MalesLymphs (cells/mm3): 965, CD4+ (cells/mm3): 523, Gender: MalesLymphs (cells/mm3): 877, CD4+ (cells/mm3): 690, Gender: MalesLymphs (cells/mm3): 770, CD4+ (cells/mm3): 681, Gender: MalesLymphs (cells/mm3): 784, CD4+ (cells/mm3): 727, Gender: MalesLymphs (cells/mm3): 896, CD4+ (cells/mm3): 741, Gender: MalesLymphs (cells/mm3): 780, CD4+ (cells/mm3): 451, Gender: MalesLymphs (cells/mm3): 970, CD4+ (cells/mm3): 524, Gender: MalesLymphs (cells/mm3): 802, CD4+ (cells/mm3): 749, Gender: MalesLymphs (cells/mm3): 870, CD4+ (cells/mm3): 539, Gender: MalesLymphs (cells/mm3): 821, CD4+ (cells/mm3): 340, Gender: MalesFemalesMales";
     protected static final String BOX_ONE_TEXT = "FemalesMales6008001000120014001600180020002200Box Plot OneGenderLymphs (cells/mm3)Males: Min: 692 Max: 2108 Q1: 965 Q2: 1235 Q3: 1672Females: Min: 1397 Max: 2185 Q1: 1677 Q2: 1787 Q3: 1964";
     protected static final String BOX_TWO_TEXT = "FemalesMales02004006008001000120014001600Box Plot Two (Custom)GenderCD4Males: Min: -1 Max: 1493 Q1: 391 Q2: 688 Q3: 950Females: Min: 163 Max: 1094 Q1: 355.5 Q2: 467 Q3: 623CD4+ (cells/mm3): 1044, Gender: Females, undefined: undefinedCD4+ (cells/mm3): 1094, Gender: Females, undefined: undefinedCD4+ (cells/mm3): 1028, Gender: Females, undefined: undefinedFemales";
 
@@ -256,17 +256,17 @@ public void genericChartHelperTest()
 
     protected static final String TIME_CHART_1 = "Luminex";
     protected static final String TIME_CHART_1_TEXT_1 = "051015202530809010020030050100150200250300350Luminex249320127Weeks Since Demographic Start DateFluorescence IntensityObserved Concentration 249320127, Weeks: 0, ObsConc TNF-alpha: 4.56 249320127, Weeks: 7, ObsConc TNF-alpha: 8.33 249320127, Weeks: 22, ObsConc TNF-alpha: 3.1 249320127, Weeks: 27, ObsConc TNF-alpha: 3.06 249320127, Weeks: 32, ObsConc TNF-alpha: 3.23 249320127, Weeks: 0, ObsConc IL-2: 16.69 249320127, Weeks: 7, ObsConc IL-2: 20.93 249320127, Weeks: 22, ObsConc IL-2: 6.07 249320127, Weeks: 27, ObsConc IL-2: 6.59 249320127, Weeks: 32, ObsConc IL-2: 6.38 249320127, Weeks: 0, ObsConc IL-10: 26.55 249320127, Weeks: 7, ObsConc IL-10: 28.28 249320127, Weeks: 22, ObsConc IL-10: 8.44 249320127, Weeks: 27, ObsConc IL-10: 13.61 249320127, Weeks: 32, ObsConc IL-10: 10.73 249320127, Weeks: 0, Fi TNF-alpha: 226.5 249320127, Weeks: 7, Fi TNF-alpha: 381 249320127, Weeks: 22, Fi TNF-alpha: 166.3 249320127, Weeks: 27, Fi TNF-alpha: 164.5 249320127, Weeks: 32, Fi TNF-alpha: 171.5 249320127, Weeks: 0, Fi IL-2: 181.8 249320127, Weeks: 7, Fi IL-2: 225.3 249320127, Weeks: 22, Fi IL-2: 75.5 249320127, Weeks: 27, Fi IL-2: 80.5 249320127, Weeks: 32, Fi IL-2: 78.5 249320127, Weeks: 0, Fi IL-10: 195.3 249320127, Weeks: 7, Fi IL-10: 206.3 249320127, Weeks: 22, Fi IL-10: 81.3 249320127, Weeks: 27, Fi IL-10: 113.5 249320127, Weeks: 32, Fi IL-10: 95.5249320127 Fi IL-10249320127 Fi IL-2249320127 Fi TNF-alpha249320127 ObsConc IL-10249320127 ObsConc IL-2249320127 ObsConcTNF-alpha";
-    protected static final String TIME_CHART_1_TEXT_2 = "05101520253070700700050100150200250300350Luminex249320107Weeks Since Demographic Start DateFluorescence IntensityObserved Concentration 249320107, Weeks: 0, ObsConc TNF-alpha: 263.92 249320107, Weeks: 6, ObsConc TNF-alpha: 6.5 249320107, Weeks: 8, ObsConc TNF-alpha: 2.83 249320107, Weeks: 15, ObsConc TNF-alpha: 3.02 249320107, Weeks: 30, ObsConc TNF-alpha: 3.57 249320107, Weeks: 0, ObsConc IL-2: 397.78 249320107, Weeks: 6, ObsConc IL-2: 14.73 249320107, Weeks: 8, ObsConc IL-2: 5.11 249320107, Weeks: 15, ObsConc IL-2: 6.1 249320107, Weeks: 30, ObsConc IL-2: 5.32 249320107, Weeks: 0, ObsConc IL-10: 266.16 249320107, Weeks: 6, ObsConc IL-10: 19.84 249320107, Weeks: 8, ObsConc IL-10: 8.32 249320107, Weeks: 15, ObsConc IL-10: 13.25 249320107, Weeks: 30, ObsConc IL-10: 12.85 249320107, Weeks: 0, Fi TNF-alpha: 7989.3 249320107, Weeks: 6, Fi TNF-alpha: 306.3 249320107, Weeks: 8, Fi TNF-alpha: 155 249320107, Weeks: 15, Fi TNF-alpha: 163 249320107, Weeks: 30, Fi TNF-alpha: 185.8 249320107, Weeks: 0, Fi IL-2: 4023 249320107, Weeks: 6, Fi IL-2: 161.8 249320107, Weeks: 8, Fi IL-2: 66.3 249320107, Weeks: 15, Fi IL-2: 75.8 249320107, Weeks: 30, Fi IL-2: 68.3 249320107, Weeks: 0, Fi IL-10: 1686.5 249320107, Weeks: 6, Fi IL-10: 152.8 249320107, Weeks: 8, Fi IL-10: 80.5 249320107, Weeks: 15, Fi IL-10: 111.3 249320107, Weeks: 30, Fi IL-10: 108.8249320107 Fi IL-10249320107 Fi IL-2249320107 Fi TNF-alpha249320107 ObsConc IL-10249320107 ObsConc IL-2249320107 ObsConcTNF-alpha";
-    protected static final String TIME_CHART_1_TEXT_3 = "1015202530357070050100150200250300350Luminex249318596Weeks Since Demographic Start DateFluorescence IntensityObserved Concentration 249318596, Weeks: 6, ObsConc TNF-alpha: 35.87 249318596, Weeks: 11, ObsConc TNF-alpha: 13.68 249318596, Weeks: 15, ObsConc TNF-alpha: 2.82 249318596, Weeks: 27, ObsConc TNF-alpha: 5.12 249318596, Weeks: 35, ObsConc TNF-alpha: 3.09 249318596, Weeks: 6, ObsConc IL-2: 52.74 249318596, Weeks: 11, ObsConc IL-2: 28.35 249318596, Weeks: 15, ObsConc IL-2: 5.19 249318596, Weeks: 27, ObsConc IL-2: 6.69 249318596, Weeks: 35, ObsConc IL-2: 5.76 249318596, Weeks: 6, ObsConc IL-10: 40.07 249318596, Weeks: 11, ObsConc IL-10: 42.38 249318596, Weeks: 15, ObsConc IL-10: 7.99 249318596, Weeks: 27, ObsConc IL-10: 32.33 249318596, Weeks: 35, ObsConc IL-10: 12.49 249318596, Weeks: 6, Fi TNF-alpha: 1454 249318596, Weeks: 11, Fi TNF-alpha: 596.5 249318596, Weeks: 15, Fi TNF-alpha: 154.5 249318596, Weeks: 27, Fi TNF-alpha: 249.8 249318596, Weeks: 35, Fi TNF-alpha: 166 249318596, Weeks: 6, Fi IL-2: 560.5 249318596, Weeks: 11, Fi IL-2: 302.5 249318596, Weeks: 15, Fi IL-2: 67 249318596, Weeks: 27, Fi IL-2: 81.5 249318596, Weeks: 35, Fi IL-2: 72.5 249318596, Weeks: 6, Fi IL-10: 281.3 249318596, Weeks: 11, Fi IL-10: 296 249318596, Weeks: 15, Fi IL-10: 78.5 249318596, Weeks: 27, Fi IL-10: 232 249318596, Weeks: 35, Fi IL-10: 106.5249318596 Fi IL-10249318596 Fi IL-2249318596 Fi TNF-alpha249318596 ObsConc IL-10249318596 ObsConc IL-2249318596 ObsConcTNF-alpha";
+    protected static final String TIME_CHART_1_TEXT_2 = "05101520253060600600050100150200250300350Luminex249320107Weeks Since Demographic Start DateFluorescence IntensityObserved Concentration 249320107, Weeks: 0, ObsConc TNF-alpha: 263.92 249320107, Weeks: 6, ObsConc TNF-alpha: 6.5 249320107, Weeks: 8, ObsConc TNF-alpha: 2.83 249320107, Weeks: 15, ObsConc TNF-alpha: 3.02 249320107, Weeks: 30, ObsConc TNF-alpha: 3.57 249320107, Weeks: 0, ObsConc IL-2: 397.78 249320107, Weeks: 6, ObsConc IL-2: 14.73 249320107, Weeks: 8, ObsConc IL-2: 5.11 249320107, Weeks: 15, ObsConc IL-2: 6.1 249320107, Weeks: 30, ObsConc IL-2: 5.32 249320107, Weeks: 0, ObsConc IL-10: 266.16 249320107, Weeks: 6, ObsConc IL-10: 19.84 249320107, Weeks: 8, ObsConc IL-10: 8.32 249320107, Weeks: 15, ObsConc IL-10: 13.25 249320107, Weeks: 30, ObsConc IL-10: 12.85 249320107, Weeks: 0, Fi TNF-alpha: 7989.3 249320107, Weeks: 6, Fi TNF-alpha: 306.3 249320107, Weeks: 8, Fi TNF-alpha: 155 249320107, Weeks: 15, Fi TNF-alpha: 163 249320107, Weeks: 30, Fi TNF-alpha: 185.8 249320107, Weeks: 0, Fi IL-2: 4023 249320107, Weeks: 6, Fi IL-2: 161.8 249320107, Weeks: 8, Fi IL-2: 66.3 249320107, Weeks: 15, Fi IL-2: 75.8 249320107, Weeks: 30, Fi IL-2: 68.3 249320107, Weeks: 0, Fi IL-10: 1686.5 249320107, Weeks: 6, Fi IL-10: 152.8 249320107, Weeks: 8, Fi IL-10: 80.5 249320107, Weeks: 15, Fi IL-10: 111.3 249320107, Weeks: 30, Fi IL-10: 108.8249320107 Fi IL-10249320107 Fi IL-2249320107 Fi TNF-alpha249320107 ObsConc IL-10249320107 ObsConc IL-2249320107 ObsConcTNF-alpha";
+    protected static final String TIME_CHART_1_TEXT_3 = "51015202530357070050100150200250300350Luminex249318596Weeks Since Demographic Start DateFluorescence IntensityObserved Concentration 249318596, Weeks: 6, ObsConc TNF-alpha: 35.87 249318596, Weeks: 11, ObsConc TNF-alpha: 13.68 249318596, Weeks: 15, ObsConc TNF-alpha: 2.82 249318596, Weeks: 27, ObsConc TNF-alpha: 5.12 249318596, Weeks: 35, ObsConc TNF-alpha: 3.09 249318596, Weeks: 6, ObsConc IL-2: 52.74 249318596, Weeks: 11, ObsConc IL-2: 28.35 249318596, Weeks: 15, ObsConc IL-2: 5.19 249318596, Weeks: 27, ObsConc IL-2: 6.69 249318596, Weeks: 35, ObsConc IL-2: 5.76 249318596, Weeks: 6, ObsConc IL-10: 40.07 249318596, Weeks: 11, ObsConc IL-10: 42.38 249318596, Weeks: 15, ObsConc IL-10: 7.99 249318596, Weeks: 27, ObsConc IL-10: 32.33 249318596, Weeks: 35, ObsConc IL-10: 12.49 249318596, Weeks: 6, Fi TNF-alpha: 1454 249318596, Weeks: 11, Fi TNF-alpha: 596.5 249318596, Weeks: 15, Fi TNF-alpha: 154.5 249318596, Weeks: 27, Fi TNF-alpha: 249.8 249318596, Weeks: 35, Fi TNF-alpha: 166 249318596, Weeks: 6, Fi IL-2: 560.5 249318596, Weeks: 11, Fi IL-2: 302.5 249318596, Weeks: 15, Fi IL-2: 67 249318596, Weeks: 27, Fi IL-2: 81.5 249318596, Weeks: 35, Fi IL-2: 72.5 249318596, Weeks: 6, Fi IL-10: 281.3 249318596, Weeks: 11, Fi IL-10: 296 249318596, Weeks: 15, Fi IL-10: 78.5 249318596, Weeks: 27, Fi IL-10: 232 249318596, Weeks: 35, Fi IL-10: 106.5249318596 Fi IL-10249318596 Fi IL-2249318596 Fi TNF-alpha249318596 ObsConc IL-10249318596 ObsConc IL-2249318596 ObsConcTNF-alpha";
     protected static final String TIME_CHART_2 = "Luminex Two";
     protected static final String TIME_CHART_2_TEXT_1 = "111122223333444455550.00.20.40.60.81.01.21.41.61.82.0Luminex TwoVisitsFI 249318596, 1, IL-10: 1 249318596, 2, IL-10: 1 249318596, 3, IL-10: 1 249318596, 4, IL-10: 1 249318596, 5, IL-10: 1 249320127, 1, IL-10: 1 249320127, 2, IL-10: 1 249320127, 3, IL-10: 1 249320127, 4, IL-10: 1 249320127, 5, IL-10: 1249318596249320127";
     protected static final String TIME_CHART_3 = "Male";
     protected static final String TIME_CHART_3_TEXT_1 = "11112222333344445555050100150200250300FemaleVisitObsConcFemale,1,ObsConc:162.61,SD:167.97381938861778Female,2,ObsConc:16.435,SD:8.238996904963614Female,3,ObsConc:5.645,SD:2.4427750612776453Female,4,ObsConc:7.605,SD:4.751853322652117Female,5,ObsConc:7.013333333333333,SD:3.932402149662046Female";
     protected static final String TIME_CHART_3_TEXT_2 = "1111222233334444555505101520253035404550MaleVisitObsConcMale,1,ObsConc:42.89333333333334,SD:8.782233960293533Male,2,ObsConc:28.136666666666667,SD:14.351189265469733Male,3,ObsConc:5.333333333333333,SD:2.587978619180101Male,4,ObsConc:14.713333333333331,SD:15.276663030038119Male,5,ObsConc:7.113333333333333,SD:4.843927469867127Male";
     protected static final String TIME_CHART_4 = "Luminex Four";
-    protected static final String TIME_CHART_4_TEXT_1 = "200400600800100012001400Luminex FourDays Since Start DateFi249318596";
+    protected static final String TIME_CHART_4_TEXT_1 = "0200400600800100012001400Luminex FourDays Since Start DateFi249318596";
     protected static final String TIME_CHART_5 = "Luminex Five";
-    protected static final String TIME_CHART_5_TEXT_1 = "05010015020001000200030004000500060007000Luminex FiveDays Since Start DateFi 249318596, Days: 44, TNF-alpha: 1454 249318596, Days: 79, TNF-alpha: 596.5 249318596, Days: 108, TNF-alpha: 154.5 249318596, Days: 190, TNF-alpha: 249.8 249318596, Days: 246, TNF-alpha: 166 249320107, Days: 0, TNF-alpha: 7989.3 249320107, Days: 42, TNF-alpha: 306.3 249320107, Days: 56, TNF-alpha: 155 249320107, Days: 105, TNF-alpha: 163 249320107, Days: 216, TNF-alpha: 185.8 249320127, Days: 0, TNF-alpha: 226.5 249320127, Days: 49, TNF-alpha: 381 249320127, Days: 160, TNF-alpha: 166.3 249320127, Days: 193, TNF-alpha: 164.5 249320127, Days: 225, TNF-alpha: 171.5 249320127, Days: 225, TNF-alpha: 171.5 249318596, Days: 44, IL-2: 560.5 249318596, Days: 79, IL-2: 302.5 249318596, Days: 108, IL-2: 67 249318596, Days: 190, IL-2: 81.5 249318596, Days: 246, IL-2: 72.5 249320107, Days: 0, IL-2: 4023 249320107, Days: 42, IL-2: 161.8 249320107, Days: 56, IL-2: 66.3 249320107, Days: 105, IL-2: 75.8 249320107, Days: 216, IL-2: 68.3 249320127, Days: 0, IL-2: 181.8 249320127, Days: 49, IL-2: 225.3 249320127, Days: 160, IL-2: 75.5 249320127, Days: 193, IL-2: 80.5 249320127, Days: 225, IL-2: 78.5 249320127, Days: 225, IL-2: 78.5 249318596, Days: 44, IL-10: 281.3 249318596, Days: 79, IL-10: 296 249318596, Days: 108, IL-10: 78.5 249318596, Days: 190, IL-10: 232 249318596, Days: 246, IL-10: 106.5 249320107, Days: 0, IL-10: 1686.5 249320107, Days: 42, IL-10: 152.8 249320107, Days: 56, IL-10: 80.5 249320107, Days: 105, IL-10: 111.3 249320107, Days: 216, IL-10: 108.8 249320127, Days: 0, IL-10: 195.3 249320127, Days: 49, IL-10: 206.3 249320127, Days: 160, IL-10: 81.3 249320127, Days: 193, IL-10: 113.5 249320127, Days: 225, IL-10: 95.5 249320127, Days: 225, IL-10: 95.5249318596 IL-10249318596 IL-2249318596 IL-6249318596 TNF-alpha249320107 IL-10249320107 IL-2249320107 IL-6249320107 TNF-alpha249320127 IL-10249320127 IL-2249320127 IL-6249320127 TNF-alpha";
+    protected static final String TIME_CHART_5_TEXT_1 = "050100150200250010002000300040005000600070008000Luminex FiveDays Since Start DateFi 249318596, Days: 44, TNF-alpha: 1454 249318596, Days: 79, TNF-alpha: 596.5 249318596, Days: 108, TNF-alpha: 154.5 249318596, Days: 190, TNF-alpha: 249.8 249318596, Days: 246, TNF-alpha: 166 249320107, Days: 0, TNF-alpha: 7989.3 249320107, Days: 42, TNF-alpha: 306.3 249320107, Days: 56, TNF-alpha: 155 249320107, Days: 105, TNF-alpha: 163 249320107, Days: 216, TNF-alpha: 185.8 249320127, Days: 0, TNF-alpha: 226.5 249320127, Days: 49, TNF-alpha: 381 249320127, Days: 160, TNF-alpha: 166.3 249320127, Days: 193, TNF-alpha: 164.5 249320127, Days: 225, TNF-alpha: 171.5 249320127, Days: 225, TNF-alpha: 171.5 249318596, Days: 44, IL-2: 560.5 249318596, Days: 79, IL-2: 302.5 249318596, Days: 108, IL-2: 67 249318596, Days: 190, IL-2: 81.5 249318596, Days: 246, IL-2: 72.5 249320107, Days: 0, IL-2: 4023 249320107, Days: 42, IL-2: 161.8 249320107, Days: 56, IL-2: 66.3 249320107, Days: 105, IL-2: 75.8 249320107, Days: 216, IL-2: 68.3 249320127, Days: 0, IL-2: 181.8 249320127, Days: 49, IL-2: 225.3 249320127, Days: 160, IL-2: 75.5 249320127, Days: 193, IL-2: 80.5 249320127, Days: 225, IL-2: 78.5 249320127, Days: 225, IL-2: 78.5 249318596, Days: 44, IL-10: 281.3 249318596, Days: 79, IL-10: 296 249318596, Days: 108, IL-10: 78.5 249318596, Days: 190, IL-10: 232 249318596, Days: 246, IL-10: 106.5 249320107, Days: 0, IL-10: 1686.5 249320107, Days: 42, IL-10: 152.8 249320107, Days: 56, IL-10: 80.5 249320107, Days: 105, IL-10: 111.3 249320107, Days: 216, IL-10: 108.8 249320127, Days: 0, IL-10: 195.3 249320127, Days: 49, IL-10: 206.3 249320127, Days: 160, IL-10: 81.3 249320127, Days: 193, IL-10: 113.5 249320127, Days: 225, IL-10: 95.5 249320127, Days: 225, IL-10: 95.5249318596 IL-10249318596 IL-2249318596 IL-6249318596 TNF-alpha249320107 IL-10249320107 IL-2249320107 IL-6249320107 TNF-alpha249320127 IL-10249320127 IL-2249320127 IL-6249320127 TNF-alpha";
 
     @Test
     public void timeChartHelperTest()
@@ -313,14 +313,14 @@ public void timeChartHelperTest()
     }
     protected static final String BOX_PLOT_COLOR_SHAPE = "Box Plot - Change outlier color/shape";
     protected static final String SCATTER_PLOT_SHAPE_COLOR_X = "Scatter - add shape/color change x";
-    protected static final String SCATTER_PLOT_SHAPE_COLOR_X_SVG_BEFORE = "800\n1000\n1200\n1400\n1600\n1800\n2000\n0\n200\n400\n600\n800\n1000\n1200\n1400\nScatter - add shape/color change x";
+    protected static final String SCATTER_PLOT_SHAPE_COLOR_X_SVG_BEFORE = "800\n1000\n1200\n1400\n1600\n1800\n2000\n2200\n0\n200\n400\n600\n800\n1000\n1200\n1400\nScatter - add shape/color change x";
     protected static final String SCATTER_PLOT_SHAPE_COLOR_X_SVG_AFTER = "0\n200\n400\n600\n800\n1000\n1200\n1400\n0\n200\n400\n600\n800\n1000\n1200\n1400\nScatter - add shape/color change x\n103866\n110349\n119180\n125478\nMales\nFemales";
     protected static final String SCATTER_HOVER_CLICK = "Scatter with hover and click";
     protected static final String LINE_ERROR_COLOR_Y = "Line/Error - Add color, change Y";
-    protected static final String LINE_ERROR_COLOR_Y_SVG = "0\n5\n10\n15\n20\n0\n10\n20\n30\n40\n50\n60\n70\n80\n90\n100\nLine/Error - Add color, change Y\nAlan\nTrey\nNick";
+    protected static final String LINE_ERROR_COLOR_Y_SVG = "0\n5\n10\n15\n20\n25\n0\n10\n20\n30\n40\n50\n60\n70\n80\n90\n100\nLine/Error - Add color, change Y\nAlan\nTrey\nNick";
     protected static final String SCATTER_REMOVE_LEGEND = "Scatter remove legend";
-    protected static final String SCATTER_REMOVE_LEGEND_SVG_BEFORE = "0\n200\n400\n600\n800\n1000\n1200\n1400\n800\n1000\n1200\n1400\n1600\n1800\n2000\nScatter remove legend\n103866\n110349\n119180\n125478";
-    protected static final String SCATTER_REMOVE_LEGEND_SVG_AFTER = "0\n200\n400\n600\n800\n1000\n1200\n1400\n800\n1000\n1200\n1400\n1600\n1800\n2000\nScatter remove legend";
+    protected static final String SCATTER_REMOVE_LEGEND_SVG_BEFORE = "0\n200\n400\n600\n800\n1000\n1200\n1400\n800\n1000\n1200\n1400\n1600\n1800\n2000\n2200\nScatter remove legend\n103866\n110349\n119180\n125478";
+    protected static final String SCATTER_REMOVE_LEGEND_SVG_AFTER = "0\n200\n400\n600\n800\n1000\n1200\n1400\n800\n1000\n1200\n1400\n1600\n1800\n2000\n2200\nScatter remove legend";
     protected static final String BRUSHED_SCATTER_W_CUSTOM_SCALES = "Scatter With Brushing and Custom Scales";
     protected static final String BRUSHED_SCATTER_W_CUSTOM_SCALES_SVG = "0\n100\n200\n300\n400\n500\n600\n0\n100\n200\n300\n400\n500\n600\n700\n800\n900\nScatter With Brushing and Custom Scales\n0\n1\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n2\n3\n4\n5\n6\n7\n8\n9";
     protected static final String CIRCLE_COLOR = "#010101";
diff --git a/src/org/labkey/test/tests/TimeChartDateBasedTest.java b/src/org/labkey/test/tests/TimeChartDateBasedTest.java
index 17329795a5..db4e4f585f 100644
--- a/src/org/labkey/test/tests/TimeChartDateBasedTest.java
+++ b/src/org/labkey/test/tests/TimeChartDateBasedTest.java
@@ -122,7 +122,7 @@ public void doVerifySteps()
 
     private static final String SVG_AXIS_X =              "0\n50\n100\n150\n200\n0\n50000\n1e+5\n1.5e+5\n2e+5\n2.5e+5\n3e+5\n3.5e+5\n4e+5\n4.5e+5\n5e+5\n5.5e+5\n6e+5\n6.5e+5\n200\n300\n400\n500\n600\n700\n800\n900\n1000\n1100\n1200\n1300\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
     private static final String SVG_AXIS_X_LEFT =         "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n200\n300\n400\n500\n600\n700\n800\n900\n1000\n1100\n1200\n1300\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
-    private static final String SVG_AXIS_X_LEFT_RIGHT =   "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n250\n300\n350\n400\n450\n500\n550\n600\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
+    private static final String SVG_AXIS_X_LEFT_RIGHT =   "0\n50\n100\n150\n200\n2e+5\n2.1e+5\n2.2e+5\n2.3e+5\n2.4e+5\n2.5e+5\n2.6e+5\n2.7e+5\n250\n300\n350\n400\n450\n500\n550\n600\n650\nHIV Test Results, Lab Results\n249320107\nDays Since Start Date\nViral Load Quantified (copies/ml)\nCD4+ (cells/mm3)\n249320107 CD4+(cells/mm3)\n249320107 Viral LoadQuantified (copies/ml)";
     private static final String AXIS_TIME_CHART = "Axis Time Chart";
     @LogMethod private void axisRangeTest()
     {
diff --git a/src/org/labkey/test/tests/visualization/LinePlotTest.java b/src/org/labkey/test/tests/visualization/LinePlotTest.java
index 2366842f65..bc79da66bd 100644
--- a/src/org/labkey/test/tests/visualization/LinePlotTest.java
+++ b/src/org/labkey/test/tests/visualization/LinePlotTest.java
@@ -245,7 +245,7 @@ private void doMultiYAxisLinePlotTest()
         checker().verifyEquals("Point count in line plot not as expected", 19, Locator.css("svg g.error-bar").findElements(getDriver()).size());
     }
 
-    private static final String LINE_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100\n105\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
+    private static final String LINE_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n60\n70\n80\n90\n100\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
     private static final String LINE_PLOT_DR_2 = "60\n70\n80\n90\n100\n110\n60\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
     private static final String LINE_PLOT_NAME_DR = "DataRegionLinePlot";
     private static final String LINE_PLOT_DESC_DR = "This line plot was created through a data region's 'Views' menu";
@@ -281,7 +281,7 @@ private void doDataRegionLinePlotTest()
         savePlot(LINE_PLOT_NAME_DR, LINE_PLOT_DESC_DR);
     }
 
-    private static final String LINE_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n1e+7\n2e+7\n3e+7\n4e+7\n5e+7\n6e+7\n7e+7\n8e+7\n9e+7\n1e+8\n1.1e+8\n1.2e+8\nTypes\nInteger\nDouble";
+    private static final String LINE_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n2e+7\n4e+7\n6e+7\n8e+7\n1e+8\n1.2e+8\nTypes\nInteger\nDouble";
     private static final String LINE_PLOT_NAME_QC = "QuickChartLinePlot";
     private static final String LINE_PLOT_DESC_QC = "This line plot was created through the 'Quick Chart' column header menu option";
     @LogMethod
diff --git a/src/org/labkey/test/tests/visualization/ScatterPlotTest.java b/src/org/labkey/test/tests/visualization/ScatterPlotTest.java
index 9764e8afd7..5818acf21e 100644
--- a/src/org/labkey/test/tests/visualization/ScatterPlotTest.java
+++ b/src/org/labkey/test/tests/visualization/ScatterPlotTest.java
@@ -170,7 +170,7 @@ public void testAssayRunFilters() throws Exception
 
         // now filter on the other run and verify expected results
         dataPage = AssayRunsPage.beginAt(this, getProjectName(), protocolId).clickAssayIdLink("secondRun");
-        String secondRunExpected = "63.56464.56565.56666.567171172173174175176177178Dataweightheight";
+        String secondRunExpected = "6363.56464.56565.56666.567171172173174175176177178Dataweightheight";
         dataPage.getDataTable().clickReportMenu(false,"HeightWeightAll");
         assertSVG(secondRunExpected);
 
@@ -420,7 +420,7 @@ private void doMultiYAxisScatterPlotTest()
         export(EXPORTED_SCRIPT_CHECK_TYPE, MEASURE_1_WEIGHT, MEASURE_5_RESPIRATIONS);
     }
 
-    private static final String SCATTER_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n55\n60\n65\n70\n75\n80\n85\n90\n95\n100\n105\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
+    private static final String SCATTER_PLOT_DR_1 = "60\n65\n70\n75\n80\n85\n90\n50\n60\n70\n80\n90\n100\n110\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
     private static final String SCATTER_PLOT_DR_2 = "60\n70\n80\n90\n100\n110\n60\n80\n100\n120\n140\n160\n180\n200\nAPX-1: Abbreviated Physical Exam\n4. Pulse\n1. Weight";
     private static final String SCATTER_PLOT_NAME_DR = "DataRegionScatterPlot";
     private static final String SCATTER_PLOT_DESC_DR = "This scatter plot was created through a data region's 'Views' menu";
@@ -457,7 +457,7 @@ private void doDataRegionScatterPlotTest()
         savePlot(SCATTER_PLOT_NAME_DR, SCATTER_PLOT_DESC_DR);
     }
 
-    private static final String SCATTER_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n1e+7\n2e+7\n3e+7\n4e+7\n5e+7\n6e+7\n7e+7\n8e+7\n9e+7\n1e+8\n1.1e+8\n1.2e+8\nTypes\nInteger\nDouble";
+    private static final String SCATTER_PLOT_QC = "0\n200000\n400000\n600000\n800000\n1000000\n1200000\n0\n2e+7\n4e+7\n6e+7\n8e+7\n1e+8\n1.2e+8\nTypes\nInteger\nDouble";
     private static final String SCATTER_PLOT_NAME_QC = "QuickChartScatterPlot";
     private static final String SCATTER_PLOT_DESC_QC = "This scatter plot was created through the 'Quick Chart' column header menu option";
     @LogMethod
@@ -829,7 +829,7 @@ private void doPointClickScatterPlotTest()
         stopImpersonating();
     }
 
-    private static final String SCATTER_PLOT_CPF_1 = "0.5\n1.0\n1.5\n2.0\n2.5\n3.0\n3.5\n50\n100\n150\n200\n250\n300\n350\n400\nCPF-1: Follow-up Chemistry Panel\n2a. Creatinine\n1a. ALT (SGPT)";
+    private static final String SCATTER_PLOT_CPF_1 = "0.5\n1.0\n1.5\n2.0\n2.5\n3.0\n3.5\n0\n50\n100\n150\n200\n250\n300\n350\n400\n450\nCPF-1: Follow-up Chemistry Panel\n2a. Creatinine\n1a. ALT (SGPT)";
     private static final String SCATTER_PLOT_NAME_BIN = "BinnedScatterPlotTest";
     private static final String SCATTER_PLOT_DESC_BIN = "This scatter plot was created with the binning threshold set to a number smaller than the data point count.";