diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index dc52f5c2f2bc6d..2c337db8304bcd 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -90,9 +90,9 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('should visualize scripted field in vertical bar chart', async function () {
-        const expectedChartValues = [ '14 31', '10 29', '7 24', '11 24', '12 23',
-          '20 23', '19 21', '6 20', '17 20', '30 20', '13 19', '18 18', '16 17', '5 16',
-          '8 16', '15 14', '3 13', '2 12', '9 10', '4 9'
+        const expectedChartValues = [ '14', '31', '10', '29', '7', '24', '11', '24', '12', '23',
+          '20', '23', '19', '21', '6', '20', '17', '20', '30', '20', '13', '19', '18', '18', '16', '17', '5', '16',
+          '8', '16', '15', '14', '3', '13', '2', '12', '9', '10', '4', '9'
         ];
         await PageObjects.discover.removeAllFilters();
         await PageObjects.discover.clickFieldListItem(scriptedExpressionFieldName);
@@ -160,9 +160,9 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('should visualize scripted field in vertical bar chart', async function () {
-        const expectedChartValues = [ '14 31', '10 29', '7 24', '11 24', '12 23',
-          '20 23', '19 21', '6 20', '17 20', '30 20', '13 19', '18 18', '16 17', '5 16',
-          '8 16', '15 14', '3 13', '2 12', '9 10', '4 9'
+        const expectedChartValues = [ '14', '31', '10', '29', '7', '24', '11', '24', '12', '23',
+          '20', '23', '19', '21', '6', '20', '17', '20', '30', '20', '13', '19', '18', '18', '16', '17', '5', '16',
+          '8', '16', '15', '14', '3', '13', '2', '12', '9', '10', '4', '9'
         ];
         await PageObjects.discover.removeAllFilters();
         await PageObjects.discover.clickFieldListItem(scriptedPainlessFieldName);
@@ -243,7 +243,7 @@ export default function ({ getService, getPageObjects }) {
         await log.debug('getDataTableData = ' + data.split('\n'));
         await log.debug('data=' + data);
         await log.debug('data.length=' + data.length);
-        expect(data.trim().split('\n')).to.eql([ 'good 359', 'bad 27' ]);
+        expect(data.trim().split('\n')).to.eql([ 'good', '359', 'bad', '27' ]);
       });
 
     });
@@ -311,7 +311,7 @@ export default function ({ getService, getPageObjects }) {
         await log.debug('getDataTableData = ' + data.split('\n'));
         await log.debug('data=' + data);
         await log.debug('data.length=' + data.length);
-        expect(data.trim().split('\n')).to.eql([ 'true 359', 'false 27' ]);
+        expect(data.trim().split('\n')).to.eql([ 'true', '359', 'false', '27' ]);
       });
 
     });
@@ -379,26 +379,26 @@ export default function ({ getService, getPageObjects }) {
         await log.debug('data=' + data);
         await log.debug('data.length=' + data.length);
         expect(data.trim().split('\n')).to.eql([
-          '2015-09-17 20:00 1',
-          '2015-09-17 21:00 1',
-          '2015-09-17 23:00 1',
-          '2015-09-18 00:00 1',
-          '2015-09-18 03:00 1',
-          '2015-09-18 04:00 1',
-          '2015-09-18 04:00 1',
-          '2015-09-18 04:00 1',
-          '2015-09-18 04:00 1',
-          '2015-09-18 05:00 1',
-          '2015-09-18 05:00 1',
-          '2015-09-18 05:00 1',
-          '2015-09-18 05:00 1',
-          '2015-09-18 06:00 1',
-          '2015-09-18 06:00 1',
-          '2015-09-18 06:00 1',
-          '2015-09-18 06:00 1',
-          '2015-09-18 07:00 1',
-          '2015-09-18 07:00 1',
-          '2015-09-18 07:00 1',
+          '2015-09-17 20:00', '1',
+          '2015-09-17 21:00', '1',
+          '2015-09-17 23:00', '1',
+          '2015-09-18 00:00', '1',
+          '2015-09-18 03:00', '1',
+          '2015-09-18 04:00', '1',
+          '2015-09-18 04:00', '1',
+          '2015-09-18 04:00', '1',
+          '2015-09-18 04:00', '1',
+          '2015-09-18 05:00', '1',
+          '2015-09-18 05:00', '1',
+          '2015-09-18 05:00', '1',
+          '2015-09-18 05:00', '1',
+          '2015-09-18 06:00', '1',
+          '2015-09-18 06:00', '1',
+          '2015-09-18 06:00', '1',
+          '2015-09-18 06:00', '1',
+          '2015-09-18 07:00', '1',
+          '2015-09-18 07:00', '1',
+          '2015-09-18 07:00', '1',
         ]);
       });
 
diff --git a/test/functional/apps/visualize/_area_chart.js b/test/functional/apps/visualize/_area_chart.js
index f82c84ee2fd983..d3638a60c29b22 100644
--- a/test/functional/apps/visualize/_area_chart.js
+++ b/test/functional/apps/visualize/_area_chart.js
@@ -140,30 +140,30 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('should show correct data', function () {
-        const expectedTableData = [ 'September 20th 2015, 00:00:00.000 37',
-          'September 20th 2015, 03:00:00.000 202',
-          'September 20th 2015, 06:00:00.000 740',
-          'September 20th 2015, 09:00:00.000 1,437',
-          'September 20th 2015, 12:00:00.000 1,371',
-          'September 20th 2015, 15:00:00.000 751',
-          'September 20th 2015, 18:00:00.000 188',
-          'September 20th 2015, 21:00:00.000 31',
-          'September 21st 2015, 00:00:00.000 42',
-          'September 21st 2015, 03:00:00.000 202',
-          'September 21st 2015, 06:00:00.000 683',
-          'September 21st 2015, 09:00:00.000 1,361',
-          'September 21st 2015, 12:00:00.000 1,415',
-          'September 21st 2015, 15:00:00.000 707',
-          'September 21st 2015, 18:00:00.000 177',
-          'September 21st 2015, 21:00:00.000 27',
-          'September 22nd 2015, 00:00:00.000 32',
-          'September 22nd 2015, 03:00:00.000 175',
-          'September 22nd 2015, 06:00:00.000 707',
-          'September 22nd 2015, 09:00:00.000 1,408',
-          'September 22nd 2015, 12:00:00.000 1,355',
-          'September 22nd 2015, 15:00:00.000 726',
-          'September 22nd 2015, 18:00:00.000 201',
-          'September 22nd 2015, 21:00:00.000 29'
+        const expectedTableData = [ 'September 20th 2015, 00:00:00.000', '37',
+          'September 20th 2015, 03:00:00.000', '202',
+          'September 20th 2015, 06:00:00.000', '740',
+          'September 20th 2015, 09:00:00.000', '1,437',
+          'September 20th 2015, 12:00:00.000', '1,371',
+          'September 20th 2015, 15:00:00.000', '751',
+          'September 20th 2015, 18:00:00.000', '188',
+          'September 20th 2015, 21:00:00.000', '31',
+          'September 21st 2015, 00:00:00.000', '42',
+          'September 21st 2015, 03:00:00.000', '202',
+          'September 21st 2015, 06:00:00.000', '683',
+          'September 21st 2015, 09:00:00.000', '1,361',
+          'September 21st 2015, 12:00:00.000', '1,415',
+          'September 21st 2015, 15:00:00.000', '707',
+          'September 21st 2015, 18:00:00.000', '177',
+          'September 21st 2015, 21:00:00.000', '27',
+          'September 22nd 2015, 00:00:00.000', '32',
+          'September 22nd 2015, 03:00:00.000', '175',
+          'September 22nd 2015, 06:00:00.000', '707',
+          'September 22nd 2015, 09:00:00.000', '1,408',
+          'September 22nd 2015, 12:00:00.000', '1,355',
+          'September 22nd 2015, 15:00:00.000', '726',
+          'September 22nd 2015, 18:00:00.000', '201',
+          'September 22nd 2015, 21:00:00.000', '29'
         ];
 
         return PageObjects.visualize.collapseChart()
diff --git a/test/functional/apps/visualize/_data_table.js b/test/functional/apps/visualize/_data_table.js
index 43a52bdb85eb6d..d77cfc8ffeaac9 100644
--- a/test/functional/apps/visualize/_data_table.js
+++ b/test/functional/apps/visualize/_data_table.js
@@ -70,8 +70,8 @@ export default function ({ getService, getPageObjects }) {
 
       it('should show correct data, take screenshot', function () {
         const expectedChartData = [
-          '0 2,088', '2,000 2,748', '4,000 2,707', '6,000 2,876',
-          '8,000 2,863', '10,000 147', '12,000 148', '14,000 129', '16,000 161', '18,000 137'
+          '0', '2,088', '2,000', '2,748', '4,000', '2,707', '6,000', '2,876',
+          '8,000', '2,863', '10,000', '147', '12,000', '148', '14,000', '129', '16,000', '161', '18,000', '137'
         ];
 
         return retry.try(function () {
diff --git a/test/functional/apps/visualize/_heatmap_chart.js b/test/functional/apps/visualize/_heatmap_chart.js
index ff8205cd526523..17ac350031d519 100644
--- a/test/functional/apps/visualize/_heatmap_chart.js
+++ b/test/functional/apps/visualize/_heatmap_chart.js
@@ -93,16 +93,16 @@ export default function ({ getService, getPageObjects }) {
 
       it('should show correct data', function () {
         // this is only the first page of the tabular data.
-        const expectedChartData =  [ 'September 20th 2015, 00:00:00.000 37',
-          'September 20th 2015, 03:00:00.000 202',
-          'September 20th 2015, 06:00:00.000 740',
-          'September 20th 2015, 09:00:00.000 1,437',
-          'September 20th 2015, 12:00:00.000 1,371',
-          'September 20th 2015, 15:00:00.000 751',
-          'September 20th 2015, 18:00:00.000 188',
-          'September 20th 2015, 21:00:00.000 31',
-          'September 21st 2015, 00:00:00.000 42',
-          'September 21st 2015, 03:00:00.000 202'
+        const expectedChartData =  [ 'September 20th 2015, 00:00:00.000', '37',
+          'September 20th 2015, 03:00:00.000', '202',
+          'September 20th 2015, 06:00:00.000', '740',
+          'September 20th 2015, 09:00:00.000', '1,437',
+          'September 20th 2015, 12:00:00.000', '1,371',
+          'September 20th 2015, 15:00:00.000', '751',
+          'September 20th 2015, 18:00:00.000', '188',
+          'September 20th 2015, 21:00:00.000', '31',
+          'September 21st 2015, 00:00:00.000', '42',
+          'September 21st 2015, 03:00:00.000', '202'
         ];
 
         return PageObjects.visualize.collapseChart()
diff --git a/test/functional/apps/visualize/_line_chart.js b/test/functional/apps/visualize/_line_chart.js
index 6d30670ab0dbcb..85021aa7402087 100644
--- a/test/functional/apps/visualize/_line_chart.js
+++ b/test/functional/apps/visualize/_line_chart.js
@@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }) {
 
       it('should show correct data, ordered by Term', function () {
 
-        const expectedChartData = ['png 1,373', 'php 445', 'jpg 9,109', 'gif 918', 'css 2,159'];
+        const expectedChartData = ['png', '1,373', 'php', '445', 'jpg', '9,109', 'gif', '918', 'css', '2,159'];
 
         return PageObjects.visualize.collapseChart()
         .then(function getDataTableData() {
diff --git a/test/functional/apps/visualize/_pie_chart.js b/test/functional/apps/visualize/_pie_chart.js
index e38af52ef80c2d..b787f2c51be1f8 100644
--- a/test/functional/apps/visualize/_pie_chart.js
+++ b/test/functional/apps/visualize/_pie_chart.js
@@ -90,8 +90,8 @@ export default function ({ getService, getPageObjects }) {
       });
 
       it('should show correct data', function () {
-        const expectedTableData =  [ '0 55', '40,000 50', '80,000 41', '120,000 43',
-          '160,000 44', '200,000 40', '240,000 46', '280,000 39', '320,000 40', '360,000 47'
+        const expectedTableData =  [ '0', '55', '40,000', '50', '80,000', '41', '120,000', '43',
+          '160,000', '44', '200,000', '40', '240,000', '46', '280,000', '39', '320,000', '40', '360,000', '47'
         ];
 
         return PageObjects.visualize.collapseChart()
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.js b/test/functional/apps/visualize/_vertical_bar_chart.js
index 54a91fc82d90ce..ea1cfea3d04d7f 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.js
+++ b/test/functional/apps/visualize/_vertical_bar_chart.js
@@ -92,16 +92,16 @@ export default function ({ getService, getPageObjects }) {
 
       it('should show correct data', function () {
         // this is only the first page of the tabular data.
-        const expectedChartData =  [ 'September 20th 2015, 00:00:00.000 37',
-          'September 20th 2015, 03:00:00.000 202',
-          'September 20th 2015, 06:00:00.000 740',
-          'September 20th 2015, 09:00:00.000 1,437',
-          'September 20th 2015, 12:00:00.000 1,371',
-          'September 20th 2015, 15:00:00.000 751',
-          'September 20th 2015, 18:00:00.000 188',
-          'September 20th 2015, 21:00:00.000 31',
-          'September 21st 2015, 00:00:00.000 42',
-          'September 21st 2015, 03:00:00.000 202'
+        const expectedChartData =  [ 'September 20th 2015, 00:00:00.000', '37',
+          'September 20th 2015, 03:00:00.000', '202',
+          'September 20th 2015, 06:00:00.000', '740',
+          'September 20th 2015, 09:00:00.000', '1,437',
+          'September 20th 2015, 12:00:00.000', '1,371',
+          'September 20th 2015, 15:00:00.000', '751',
+          'September 20th 2015, 18:00:00.000', '188',
+          'September 20th 2015, 21:00:00.000', '31',
+          'September 21st 2015, 00:00:00.000', '42',
+          'September 21st 2015, 03:00:00.000', '202'
         ];
 
         return PageObjects.visualize.collapseChart()