diff --git a/tests/screenshot/diff-reporter.js b/tests/screenshot/diff-reporter.js
deleted file mode 100644
index 25a4b6929..000000000
--- a/tests/screenshot/diff-reporter.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// diff-reporter.js
-
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Reporter that prints results to the console with the same
- * format as the spec reporter, but also saves a test_output.js file with a
- * variable that just wraps a json object, for use in diff_viewer.html.
- */
-var mocha = require('mocha');
-var fs = require("fs");
-module.exports = DiffReporter;
-
-
-function DiffReporter(runner) {
-  mocha.reporters.Base.call(this, runner);
-  var passes = 0;
-  var failures = 0;
-
-  // Values for the JSON output.
-  var json_tests = [];
-
-  // From the spec reporter.
-  var self = this;
-  var indents = 0;
-  var n = 0;
-  var colours = {
-    pass: 32,
-    fail: 31,
-    'bright pass': 92,
-    'bright fail': 91,
-    'bright yellow': 93,
-    pending: 36,
-    suite: 0,
-    'error title': 0,
-    'error message': 31,
-    'error stack': 90,
-    checkmark: 32,
-    fast: 90,
-    medium: 33,
-    slow: 31,
-    green: 32,
-    light: 90,
-    'diff gutter': 90,
-    'diff added': 32,
-    'diff removed': 31
-  };
-
-  var symbols = {
-    ok: '✓',
-    err: '✖',
-    dot: '․',
-    comma: ',',
-    bang: '!'
-  };
-
-  /**
-   * colour `str` with the given `type`,
-   * allowing colours to be disabled,
-   * as well as user-defined colour
-   * schemes.
-   *
-   * @private
-   * @param {string} type
-   * @param {string} str
-   * @return {string}
-   */
-  var colour = function(type, str) {
-    if (!colours) {
-      return String(str);
-    }
-    return '\u001b[' + colours[type] + 'm' + str + '\u001b[0m';
-  };
-
-  function indent() {
-    return Array(indents).join('  ');
-  }
-
-  // Indent/unindent correctly.
-  runner.on('start', function() {
-    console.log();
-  });
-  runner.on('suite', function(suite) {
-    ++indents;
-    console.log(colour('suite', '%s%s'), indent(), suite.title);
-  });
-  runner.on('suite end', function() {
-    --indents;
-    if (indents === 1) {
-      console.log();
-    }
-  });
-  runner.on('pass', function(test) {
-    passes++;
-    json_tests.push(test);
-    var logStr =
-      indent() +
-      colour('checkmark', '  ' + symbols.ok) +
-      colour('pass', ' ' + test.title);
-      console.log(logStr);
-  });
-
-  runner.on('fail', function(test, err) {
-    failures++;
-    json_tests.push(test);
-    // Print test information the way the spec reporter would.
-    console.log(indent() + colour('fail', '  %d) %s'), ++n, test.title);
-  });
-
-  runner.on('end', function() {
-    console.log('\n%d/%d tests passed\n', passes, passes + failures);
-    var jsonObj = {
-      passes: passes,
-      failures: failures,
-      total: passes + failures,
-      tests: json_tests.map(clean)
-    }
-    runner.testResults = jsonObj;
-
-    let json = JSON.stringify(jsonObj, null, 2)
-    let jsonOutput = writeJSON(json, 'test_output')
-  });
-
-
-  function clean(test) {
-    return {
-      title: test.title,
-      fullTitle: test.fullTitle(),
-      state: test.state
-    };
-  }
-
-  function writeJSON(data, filename){
-    let output_dir = `${process.cwd()}/tests/screenshot/outputs`
-    let output= `${output_dir}/${filename}`
-
-    if (!fs.existsSync(output_dir)){
-      fs.mkdirSync(output_dir);
-    }
-    fs.writeFileSync(output + '.json', data)
-
-    fs.writeFileSync(output + '.js', 'var results = ' + data);
-    return output
-  }
-}
-mocha.utils.inherits(DiffReporter, mocha.reporters.Spec);
diff --git a/tests/screenshot/diff_screenshots.js b/tests/screenshot/diff_screenshots.js
deleted file mode 100644
index d4df57ad2..000000000
--- a/tests/screenshot/diff_screenshots.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Mocha tests that diff images and save the diffs as artifacts.
- */
-
-var chai = require('chai');
-var fs = require('fs'),
-    PNG = require('pngjs').PNG,
-    pixelmatch = require('pixelmatch');
-
-var old_dir = 'tests/screenshot/outputs/old/';
-var new_dir = 'tests/screenshot/outputs/new/';
-var diff_dir = 'tests/screenshot/outputs/diff/';
-var test_list_location ='tests/screenshot/test_cases/test_cases.json';
-
-if (!fs.existsSync(diff_dir)){
-  fs.mkdirSync(diff_dir);
-}
-
-function getTestList() {
-  var file = fs.readFileSync(test_list_location);
-  var json = JSON.parse(file);
-  var testSpecArr = json.tests;
-  var testList = [];
-  for (var i = 0, testSpec; testSpec = testSpecArr[i]; i++) {
-    if (!testSpec.skip) {
-      testList.push(testSpec.title);
-    }
-  }
-  return testList;
-}
-
-var test_list = getTestList();
-
-suite('Rendering', function() {
-  /**
-   * - Load the old and new files as PNGs
-   * - Diff the files
-   * - Assert that the files are the same
-   * - Save the visual diff to a file.
-   */
-  function diffScreenshots(name) {
-
-    var file1 = fs.readFileSync(old_dir + name  + '.png');
-    var img1 = PNG.sync.read(file1);
-
-    var file2 = fs.readFileSync(new_dir + name + '.png');
-    var img2 = PNG.sync.read(file2);
-
-    var diff = new PNG({width: img1.width, height: img1.height});
-
-    var mismatch_num = pixelmatch(
-        img1.data,
-        img2.data,
-        diff.data,
-        img1.width,
-        img1.height, {threshold: 0.1});
-    diff.pack().pipe(fs.createWriteStream(diff_dir + name + '.png'));
-    chai.assert.equal(mismatch_num, 0);
-  }
-
-  test_list.forEach(function(testName) {
-    test(testName, function() {
-      diffScreenshots(testName);
-    })
-  });
-});
diff --git a/tests/screenshot/diff_viewer.html b/tests/screenshot/diff_viewer.html
deleted file mode 100644
index 2c907c8db..000000000
--- a/tests/screenshot/diff_viewer.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<!--
-@license
-Copyright 2019 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-<head>
-<meta charset="utf-8">
-<title>Diff Viewer</title>
-<script src="outputs/test_output.js"></script>
-<script>
-'use strict';
-function start() {
-
-  var test_list = results.tests;
-
-  var table = document.getElementById('results_table');
-
-  for (var i = 0, test; test = test_list[i]; i++) {
-    addTest(table, test);
-  }
-}
-
-function addTest(table, test) {
-  var row = table.insertRow(-1);
-  var className = 'tableRow';
-  if (test.state == 'failed') {
-    className += ' failedTest'
-  } else {
-    className += ' passedTest';
-  }
-  row.className = className;
-  var cell1 = row.insertCell(0);
-  cell1.innerHTML = test.title;
-  var displayed = (test.state == "failed")
-  cell1.displayed = displayed;
-  cell1.className = 'testName';
-  var cell2 = addImageCell(row, test.title, 'old', displayed);
-  var cell3 = addImageCell(row, test.title, 'new', displayed);
-  var cell4 = addImageCell(row, test.title, 'diff', displayed);
-
-  cell1.onclick = function() {
-    var display = !cell1.displayed;
-    cell1.displayed = display;
-    setVisibility(cell2, display);
-    setVisibility(cell3, display);
-    setVisibility(cell4, display);
-  }
-
-}
-
-function setVisibility(cell, displayed) {
-  var img = cell.firstChild;
-  if (displayed) {
-    img.className = '';
-  } else {
-    img.className = 'hidden';
-  }
-}
-function addImageCell(row, name, dir, displayed) {
-  var cell = row.insertCell();
-  cell.className = 'imageCell';
-  var img = document.createElement('img');
-  img.src = 'outputs/' + dir + '/' + name + '.png';
-  cell.appendChild(img);
-  if (!displayed) {
-    img.className = 'hidden';
-  }
-  return cell;
-}
-</script>
-
-<style>
-.imageCell {
-  width: 30%;
-  overflow: hidden
-}
-.hidden {
-  display: none;
-}
-.testName {
-  cursor: pointer;
-}
-.failedTest .testName {
-  background: lightgrey;
-}
-.passedTest .testName {
-  background: forestgreen;
-}
-td {
-  border: 1px solid black;
-}
-th {
-  border: 1px solid black;
-}
-
-table {
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: collapse;
-  border: 1px solid black;
-}
-
-</style>
-</head>
-<body onload="start()">
-  <div>
-    <table id="results_table">
-      <tr>
-        <th style="width:100px">Test name</th>
-        <th>Old</th>
-        <th>New</th>
-        <th>Diff</th>
-      </tr>
-  </div>
-</body>
-</html>
diff --git a/tests/screenshot/gen_screenshots.js b/tests/screenshot/gen_screenshots.js
deleted file mode 100644
index 48af66d12..000000000
--- a/tests/screenshot/gen_screenshots.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * @license
- * Copyright 2019 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Node.js script to generate screenshots in Chrome, via webdriver.
- */
-var webdriverio = require('webdriverio');
-var fs = require('fs');
-
-module.exports = genScreenshots;
-
-var isCollapsed = false;
-var filterText = '';
-var isInsertionMarker = false;
-var isRtl = false;
-var inlineInputs = false;
-var externalInputs = false;
-
-function processArgs() {
-  var args = process.argv;
-  for (var i = 0; i < args.length; i++) {
-    var arg = args[i];
-    if (arg === '--collapsed') {
-      isCollapsed = true;
-    } else if (arg === '--name') {
-      filterText = args[i + 1];
-    } else if (arg === '--insertionMarker') {
-      isInsertionMarker = true;
-    } else if (arg === '--rtl') {
-      isRtl = true;
-    } else if (arg === '--inlineInputs') {
-      inlineInputs = true
-    } else if (arg === '--externalInputs') {
-      externalInputs = true
-    }
-  }
-}
-
-function checkAndCreateDir(dirname) {
-  if (!fs.existsSync(dirname)){
-    fs.mkdirSync(dirname);
-  }
-};
-
-/**
- * Opens two different webdriverio browsers.  One uses the hosted version of
- * blockly_compressed.js; the other uses the local blockly_uncompressed.js.
- *
- * Each playground is a minimal Blockly instance.  This loads the same XML in
- * both playgrounds and saves a screenshot of each.
- */
-async function genScreenshots() {
-  var output_url = 'tests/screenshot/outputs'
-  processArgs();
-  checkAndCreateDir(output_url)
-  checkAndCreateDir(output_url + '/old');
-  checkAndCreateDir(output_url + '/new');
-
-  var url_prefix = 'file://' + __dirname + '/playground';
-  var browser_new = await buildBrowser(url_prefix + '_new.html', isRtl);
-  var browser_old = await buildBrowser(url_prefix + '_old.html', isRtl);
-  var test_list = getTestList();
-  for (var i = 0, testName; testName = test_list[i]; i++) {
-    await genSingleScreenshot(browser_new, 'new', testName, isCollapsed, isInsertionMarker, inlineInputs, externalInputs);
-    if (!fs.existsSync(output_url + '/old/' + testName)) {
-      await genSingleScreenshot(browser_old, 'old', testName, isCollapsed, isInsertionMarker, inlineInputs, externalInputs);
-    }
-  }
-
-  await cleanUp(browser_new, browser_old);
-  return 0;
-}
-
-function getTestList() {
-  var file = fs.readFileSync('tests/screenshot/test_cases/test_cases.json');
-  var json = JSON.parse(file);
-  var testSpecArr = json.tests;
-  var testList = [];
-  for (var i = 0, testSpec; testSpec = testSpecArr[i]; i++) {
-    if (!testSpec.skip && testSpec.title.includes(filterText)) {
-      testList.push(testSpec.title);
-    }
-  }
-  return testList;
-}
-
-async function cleanUp(browser_new, browser_old) {
-  await browser_new.deleteSession();
-  await browser_old.deleteSession();
-}
-
-async function buildBrowser(url, isRtl) {
-  var options = {
-    capabilities: {
-      browserName: 'chrome'
-    },
-    logLevel: 'warn'
-  };
-  // Run in headless mode on Travis.
-  if (process.env.TRAVIS_CI) {
-    options.capabilities['goog:chromeOptions'] = {
-      args: ['--headless', '--no-sandbox', '--disable-dev-shm-usage']
-    };
-  }
-  console.log('Starting webdriverio...');
-  const browser = await webdriverio.remote(options);
-  var injectBlockly = function(isRtl) {
-    workspace = Blockly.inject('blocklyDiv',
-    {
-      comments: true,
-      collapse: true,
-      disable: true,
-
-      horizontalLayout: false,
-      maxBlocks: Infinity,
-      maxInstances: {'test_basic_limit_instances': 3},
-      media: '../../media/',
-      oneBasedIndex: true,
-      readOnly: false,
-      rtl: isRtl,
-      move: {
-        scrollbars: false,
-        drag: true,
-        wheel: false,
-      },
-      toolboxPosition: 'start',
-      zoom:
-        {
-          controls: false,
-          wheel: true,
-          startScale: 2.0,
-          maxScale: 4,
-          minScale: 0.25,
-          scaleSpeed: 1.1
-        }
-    });
-  }
-
-  await browser.setWindowSize(500, 500);
-  console.log('Initialized.\nLoading url: ' + url);
-  await browser.url(url);
-  await browser.execute(injectBlockly, isRtl);
-  return browser;
-}
-
-async function genSingleScreenshot(browser, dir, test_name, isCollapsed, isInsertionMarker, inlineInputs, externalInputs) {
-  var prefix = './tests/screenshot/';
-  var xml_url = prefix + 'test_cases/' + test_name;
-  var xml = fs.readFileSync(xml_url, 'utf8');
-
-  var loadXmlFn = function(xml_text, isCollapsed, isInsertionMarker, inlineInputs, externalInputs) {
-    workspace.clear();
-    var xml = Blockly.Xml.textToDom(xml_text);
-    Blockly.Xml.domToWorkspace(xml, workspace);
-    if (isCollapsed || isInsertionMarker || inlineInputs || externalInputs) {
-      var blocks = workspace.getAllBlocks(false);
-      for (var i = 0, block; block = blocks[i]; i++) {
-        block.setCollapsed(isCollapsed);
-        block.setInsertionMarker(isInsertionMarker);
-        if (inlineInputs) {
-          block.setInputsInline(true);
-        } else if (externalInputs) {
-          block.setInputsInline(false);
-        }
-      }
-    }
-  };
-  await browser.execute(loadXmlFn, xml, isCollapsed, isInsertionMarker, inlineInputs, externalInputs);
-  await browser.saveScreenshot(prefix + '/outputs/' + dir + '/' + test_name + '.png');
-}
-
-
-if (require.main === module) {
-  genScreenshots();
-}
diff --git a/tests/screenshot/img_viewer.html b/tests/screenshot/img_viewer.html
deleted file mode 100644
index 366fdb2ab..000000000
--- a/tests/screenshot/img_viewer.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<!--
-@license
-Copyright 2019 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Image comparison</title>
-
-  <style>
-    html, body {
-      height: 100%;
-    }
-  </style>
-  <script type="text/javascript">
-    var showOld = false;
-    function start() {
-      if (sessionStorage) {
-        var text = sessionStorage.getItem('imgName');
-        if (text) {
-          document.getElementById('imgName').value = text;
-        }
-      } else {
-        // MSIE 11 does not support sessionStorage on file:// URLs.
-        logEvents(false);
-      }
-      openImage();
-    }
-    function openImage() {
-      var imgName = document.getElementById('imgName').value;
-      if (sessionStorage) {
-        sessionStorage.setItem('imgName', imgName);
-      }
-      var imgElem = document.getElementById('image');
-      if (showOld) {
-        imgElem.setAttribute('src', './outputs/old/' + imgName + '.png');
-        document.getElementById('versionName').innerHTML = 'Old';
-      } else {
-        imgElem.setAttribute('src', './outputs/new/' + imgName + '.png');
-        document.getElementById('versionName').innerHTML = 'New';
-      }
-    }
-
-    function showDiff() {
-      var imgName = document.getElementById('imgName').value;
-      var imgElem = document.getElementById('image');
-      imgElem.setAttribute('src', './outputs/diff/' + imgName + '.png');
-      document.getElementById('versionName').innerHTML = 'Diff';
-    }
-    function onImageClick() {
-      showOld = !showOld;
-      openImage();
-    }
-  </script>
-<body onload="start()">
-  <textarea id="imgName"></textarea>
-  <input type="button" value="open" onclick="openImage()">
-  <input type="button" value="show diff" onclick="showDiff()">
-
-  <h1 id="versionName"></h1>
-  <br>
-  <img id="image" onclick="onImageClick()">
-</body>
diff --git a/tests/screenshot/playground_new.html b/tests/screenshot/playground_new.html
deleted file mode 100644
index f6a4bdc34..000000000
--- a/tests/screenshot/playground_new.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!DOCTYPE html>
-<!--
-@license
-Copyright 2019 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-<head>
-<meta charset="utf-8">
-<title>Blockly Playground: New rendering</title>
-<script src="../../blockly_uncompressed.js"></script>
-<script src="../../msg/messages.js"></script>
-<script src="../../blocks/logic.js"></script>
-<script src="../../blocks/loops.js"></script>
-<script src="../../blocks/math.js"></script>
-<script src="../../blocks/text.js"></script>
-<script src="../../blocks/lists.js"></script>
-<script src="../../blocks/colour.js"></script>
-<script src="../../blocks/variables.js"></script>
-<script src="../../blocks/variables_dynamic.js"></script>
-<script src="../../blocks/procedures.js"></script>
-<script src="../blocks/test_blocks.js"></script>
-
-<style>
-html, body {
-  height: 100%;
-}
-body {
-  background-color: #fff;
-  font-family: sans-serif;
-  overflow: hidden;
-}
-h1 {
-  font-weight: normal;
-  font-size: 140%;
-}
-#blocklyDiv {
-  height: 100%;
-  width: 100%;
-}
-#importExport {
-  font-family: monospace;
-}
-
-.ioLabel>.blocklyFlyoutLabelText {
-  font-style: italic;
-}
-.blockRenderDebug {
-  display: none;
-}
-
-.rowRenderingRect {
-  stroke: black;
-  fill: none;
-  stroke-width: 1px;
-}
-
-.elemRenderingRect {
-  stroke: red;
-  fill: none;
-  stroke-width: 1px;
-}
-
-.rowSpacerRect {
-  stroke: blue;
-  fill-opacity: 0.5;
-  fill: blue;
-  stroke-width: 1px;
-}
-
-.elemSpacerRect {
-  stroke: pink;
-  fill-opacity: 0.5;
-  fill: pink;
-  stroke-width: 1px;
-}
-
-.connectionRenderingDot {
-  display: none;
-}
-
-.blockBoundingBox {
-  stroke: black;
-  stroke-dasharray: 5,5;
-  fill: none;
-  stroke-width: 1px;
-}
-</style>
-</head>
-<body onload="start()">
-
-  <div id="blocklyDiv"></div>
-</body>
-</html>
diff --git a/tests/screenshot/playground_old.html b/tests/screenshot/playground_old.html
deleted file mode 100644
index 131cc1144..000000000
--- a/tests/screenshot/playground_old.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<!--
-@license
-Copyright 2019 Google LLC
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<html>
-<head>
-<meta charset="utf-8">
-<title>Blockly Playground: Old rendering</title>
-<script src="https://blockly-demo.appspot.com/static/blockly_compressed.js"></script>
-<script src="../../msg/messages.js"></script>
-<script src="../../blocks/logic.js"></script>
-<script src="../../blocks/loops.js"></script>
-<script src="../../blocks/math.js"></script>
-<script src="../../blocks/text.js"></script>
-<script src="../../blocks/lists.js"></script>
-<script src="../../blocks/colour.js"></script>
-<script src="../../blocks/variables.js"></script>
-<script src="../../blocks/variables_dynamic.js"></script>
-<script src="../../blocks/procedures.js"></script>
-<script src="../blocks/test_blocks.js"></script>
-
-<style>
-html, body {
-  height: 100%;
-}
-body {
-  background-color: #fff;
-  font-family: sans-serif;
-  overflow: hidden;
-}
-h1 {
-  font-weight: normal;
-  font-size: 140%;
-}
-#blocklyDiv {
-  height: 100%;
-  width: 100%;
-}
-#importExport {
-  font-family: monospace;
-}
-
-.ioLabel>.blocklyFlyoutLabelText {
-  font-style: italic;
-}
-
-</style>
-</head>
-<body onload="start()">
-
-  <div id="blocklyDiv"></div>
-</body>
-</html>
diff --git a/tests/screenshot/run_differ.py b/tests/screenshot/run_differ.py
deleted file mode 100644
index efc699922..000000000
--- a/tests/screenshot/run_differ.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/python2.7
-#
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Usage:
-# run_differ.py with no parameters runs all screenshot tests with blocks in rtl
-# and not collapsed.
-# --name <test_name> runs all tests that contain the given name. If not given,
-#   runs all tests specified in test_cases.json.
-# --collapsed runs all tests with the blocks collapsed. If not given, blocks are
-#  expanded.
-# --insertionMarker runs all tests with the blocks set as insertion markers. If
-#   not given then will default to normal blocks.
-# --inlineInputs runs all tests with the blocks set to have inline inputs. If
-#   not given then the blocks will be in their default state.
-# --externalInputs runs all tests with the with all blocks set to have external
-#   inputs. If not given then the blocks will be in their default state.
-#
-
-import os, errno, platform, shutil, sys
-
-NAME_ARG = "--name"
-COLLAPSE_ARG = "--collapsed"
-RTL_ARG = "--rtl"
-INSERTION_ARG = "--insertionMarker"
-INLINE_INPUTS_ARG = "--inlineInputs"
-EXTERNAL_INPUTS_ARG = "--externalInputs"
-
-ARG_VALS = [COLLAPSE_ARG, RTL_ARG, INSERTION_ARG, INLINE_INPUTS_ARG, EXTERNAL_INPUTS_ARG]
-
-# Generates the screenshots according to the given parameters, diffs the
-# screenshots and then displays them.
-def main():
-  cleanup()
-  check_arguments()
-  filter_text = find_argument_value(NAME_ARG)
-  argument_string = create_arg_string()
-  gen_screenshots(filter_text, argument_string)
-  diff_screenshots(filter_text)
-  display_screenshots()
-
-# Cleans up any files left over from running the script previously.
-def cleanup():
-  remove_dir("tests/screenshot/outputs/new")
-  remove_dir("tests/screenshot/outputs/diff")
-  remove_file("tests/screenshot/outputs/test_output.js")
-  remove_file("tests/screenshot/outputs/test_output.json")
-
-# If the --name is given find the name of the test case.
-def find_argument_value(argument_name):
-  args = sys.argv
-  for i in range(len(args)):
-    if args[i] == argument_name:
-      if i + 1 < len(args):
-        return args[i+1]
-      else:
-        print ("Must supply a name after name arg")
-        sys.exit()
-  return ""
-
-# Prints an error and exits if the arguments given aren't allowed.
-def check_arguments():
-  if (INLINE_INPUTS_ARG in sys.argv) and (EXTERNAL_INPUTS_ARG in sys.argv):
-    print ("Can not have both --inlineInputs and --externalInputs")
-    sys.exit()
-
-# Create a string with all arguments.
-def create_arg_string():
-  arg_string = ""
-  for arg in sys.argv:
-    arg_string = arg_string + " " + arg
-  return arg_string
-
-# Generates a set of old and new screenshots according to the given parameters.
-def gen_screenshots(filter_text, argument_string):
-  os.system("node tests/screenshot/gen_screenshots.js " + argument_string)
-
-# Diffs the old and new screenshots that were created in gen_screenshots.
-def diff_screenshots(filter_text):
-  if filter_text != "":
-    os.system("./node_modules/.bin/mocha tests/screenshot/diff_screenshots.js --ui tdd --reporter ./tests/screenshot/diff-reporter.js" + " --fgrep " + filter_text)
-  else:
-    os.system("./node_modules/.bin/mocha tests/screenshot/diff_screenshots.js --ui tdd --reporter ./tests/screenshot/diff-reporter.js")
-
-# Displays the old screenshots, new screenshots, and the diff of them.
-def display_screenshots():
-  if (platform.system() == "Linux"):
-    os.system("xdg-open tests/screenshot/diff_viewer.html")
-  elif (platform.system() == 'Darwin'):
-    os.system("open tests/screenshot/diff_viewer.html")
-
-# Removes a file and catches the error if the file does not exist.
-def remove_file(filename):
-  try:
-    os.remove(filename)
-  except (OSError) as e:
-    if e.errno != errno.ENOENT:
-      raise
-
-# Removes a directory and catches the error if the directory does not exist.
-def remove_dir(dir_name):
-  try:
-    shutil.rmtree(dir_name)
-  except (OSError) as e:
-    if e.errno != errno.ENOENT:
-      raise
-
-if __name__ == "__main__":
-  main()
diff --git a/tests/screenshot/test_cases/colour_blend b/tests/screenshot/test_cases/colour_blend
deleted file mode 100644
index 872c8814b..000000000
--- a/tests/screenshot/test_cases/colour_blend
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_blend"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_picker b/tests/screenshot/test_cases/colour_picker
deleted file mode 100644
index bd24b9aa8..000000000
--- a/tests/screenshot/test_cases/colour_picker
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_picker"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_random b/tests/screenshot/test_cases/colour_random
deleted file mode 100644
index ce294d931..000000000
--- a/tests/screenshot/test_cases/colour_random
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_random"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/colour_rgb b/tests/screenshot/test_cases/colour_rgb
deleted file mode 100644
index 29b3dedcc..000000000
--- a/tests/screenshot/test_cases/colour_rgb
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_rgb"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_flow_statements b/tests/screenshot/test_cases/controls_flow_statements
deleted file mode 100644
index efe98837b..000000000
--- a/tests/screenshot/test_cases/controls_flow_statements
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_flow_statements"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_for b/tests/screenshot/test_cases/controls_for
deleted file mode 100644
index 3604aebff..000000000
--- a/tests/screenshot/test_cases/controls_for
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_for"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_forEach b/tests/screenshot/test_cases/controls_forEach
deleted file mode 100644
index 24dc91762..000000000
--- a/tests/screenshot/test_cases/controls_forEach
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_forEach"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if b/tests/screenshot/test_cases/controls_if
deleted file mode 100644
index 83e374786..000000000
--- a/tests/screenshot/test_cases/controls_if
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_if"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_else b/tests/screenshot/test_cases/controls_if_else
deleted file mode 100644
index 904433868..000000000
--- a/tests/screenshot/test_cases/controls_if_else
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_if_else"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_elseif b/tests/screenshot/test_cases/controls_if_elseif
deleted file mode 100644
index d6988f20f..000000000
--- a/tests/screenshot/test_cases/controls_if_elseif
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_if_elseif"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_if_if b/tests/screenshot/test_cases/controls_if_if
deleted file mode 100644
index c2977749e..000000000
--- a/tests/screenshot/test_cases/controls_if_if
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_if_if"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_ifelse b/tests/screenshot/test_cases/controls_ifelse
deleted file mode 100644
index a648344ec..000000000
--- a/tests/screenshot/test_cases/controls_ifelse
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_ifelse"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_repeat b/tests/screenshot/test_cases/controls_repeat
deleted file mode 100644
index c918fb74c..000000000
--- a/tests/screenshot/test_cases/controls_repeat
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_repeat"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_repeat_ext b/tests/screenshot/test_cases/controls_repeat_ext
deleted file mode 100644
index c0b57c8db..000000000
--- a/tests/screenshot/test_cases/controls_repeat_ext
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_repeat_ext"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/controls_whileUntil b/tests/screenshot/test_cases/controls_whileUntil
deleted file mode 100644
index 0e3423547..000000000
--- a/tests/screenshot/test_cases/controls_whileUntil
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="controls_whileUntil"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_empty b/tests/screenshot/test_cases/lists_create_empty
deleted file mode 100644
index fc6dcacde..000000000
--- a/tests/screenshot/test_cases/lists_create_empty
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_create_empty"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with b/tests/screenshot/test_cases/lists_create_with
deleted file mode 100644
index 7e3cb9603..000000000
--- a/tests/screenshot/test_cases/lists_create_with
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_create_with"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with_container b/tests/screenshot/test_cases/lists_create_with_container
deleted file mode 100644
index b886158c0..000000000
--- a/tests/screenshot/test_cases/lists_create_with_container
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_create_with_container"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_create_with_item b/tests/screenshot/test_cases/lists_create_with_item
deleted file mode 100644
index c92762fd6..000000000
--- a/tests/screenshot/test_cases/lists_create_with_item
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_create_with_item"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_getIndex b/tests/screenshot/test_cases/lists_getIndex
deleted file mode 100644
index d069e04ae..000000000
--- a/tests/screenshot/test_cases/lists_getIndex
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_getIndex"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_getSublist b/tests/screenshot/test_cases/lists_getSublist
deleted file mode 100644
index f967bc911..000000000
--- a/tests/screenshot/test_cases/lists_getSublist
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_getSublist"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_indexOf b/tests/screenshot/test_cases/lists_indexOf
deleted file mode 100644
index 1d3f16f7f..000000000
--- a/tests/screenshot/test_cases/lists_indexOf
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_indexOf"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_isEmpty b/tests/screenshot/test_cases/lists_isEmpty
deleted file mode 100644
index fabbd9607..000000000
--- a/tests/screenshot/test_cases/lists_isEmpty
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_isEmpty"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_length b/tests/screenshot/test_cases/lists_length
deleted file mode 100644
index 4c6aa2bf8..000000000
--- a/tests/screenshot/test_cases/lists_length
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_length"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_repeat b/tests/screenshot/test_cases/lists_repeat
deleted file mode 100644
index 20db6be7a..000000000
--- a/tests/screenshot/test_cases/lists_repeat
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_repeat"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_reverse b/tests/screenshot/test_cases/lists_reverse
deleted file mode 100644
index 6269dc23b..000000000
--- a/tests/screenshot/test_cases/lists_reverse
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_reverse"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_setIndex b/tests/screenshot/test_cases/lists_setIndex
deleted file mode 100644
index e50b6879c..000000000
--- a/tests/screenshot/test_cases/lists_setIndex
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_setIndex"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_sort b/tests/screenshot/test_cases/lists_sort
deleted file mode 100644
index 98dd4bd55..000000000
--- a/tests/screenshot/test_cases/lists_sort
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_sort"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/lists_split b/tests/screenshot/test_cases/lists_split
deleted file mode 100644
index d1a5c9f4e..000000000
--- a/tests/screenshot/test_cases/lists_split
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="lists_split"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_boolean b/tests/screenshot/test_cases/logic_boolean
deleted file mode 100644
index d10c00f16..000000000
--- a/tests/screenshot/test_cases/logic_boolean
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_boolean"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_compare b/tests/screenshot/test_cases/logic_compare
deleted file mode 100644
index 014b9a916..000000000
--- a/tests/screenshot/test_cases/logic_compare
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_compare"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_negate b/tests/screenshot/test_cases/logic_negate
deleted file mode 100644
index 648885cb0..000000000
--- a/tests/screenshot/test_cases/logic_negate
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_negate"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_null b/tests/screenshot/test_cases/logic_null
deleted file mode 100644
index ffc322af6..000000000
--- a/tests/screenshot/test_cases/logic_null
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_null"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_operation b/tests/screenshot/test_cases/logic_operation
deleted file mode 100644
index b02967d5d..000000000
--- a/tests/screenshot/test_cases/logic_operation
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_operation"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/logic_ternary b/tests/screenshot/test_cases/logic_ternary
deleted file mode 100644
index 84f47e0b1..000000000
--- a/tests/screenshot/test_cases/logic_ternary
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_ternary"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_addition b/tests/screenshot/test_cases/math_addition
deleted file mode 100644
index 0637ea11d..000000000
--- a/tests/screenshot/test_cases/math_addition
+++ /dev/null
@@ -1,15 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_arithmetic">
-    <field name="OP">ADD</field>
-    <value name="A">
-      <shadow type="math_number">
-        <field name="NUM">1</field>
-      </shadow>
-    </value>
-    <value name="B">
-      <shadow type="math_number">
-        <field name="NUM">1</field>
-      </shadow>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/math_arithmetic b/tests/screenshot/test_cases/math_arithmetic
deleted file mode 100644
index 831727763..000000000
--- a/tests/screenshot/test_cases/math_arithmetic
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_arithmetic"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_atan2 b/tests/screenshot/test_cases/math_atan2
deleted file mode 100644
index 6d53e2ba0..000000000
--- a/tests/screenshot/test_cases/math_atan2
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_atan2"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_change b/tests/screenshot/test_cases/math_change
deleted file mode 100644
index 90894f95c..000000000
--- a/tests/screenshot/test_cases/math_change
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_change"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_constant b/tests/screenshot/test_cases/math_constant
deleted file mode 100644
index 67a568754..000000000
--- a/tests/screenshot/test_cases/math_constant
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_constant"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_constrain b/tests/screenshot/test_cases/math_constrain
deleted file mode 100644
index f98273b0c..000000000
--- a/tests/screenshot/test_cases/math_constrain
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_constrain"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_modulo b/tests/screenshot/test_cases/math_modulo
deleted file mode 100644
index cbd1c5e2f..000000000
--- a/tests/screenshot/test_cases/math_modulo
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_modulo"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_number b/tests/screenshot/test_cases/math_number
deleted file mode 100644
index 6eb9a8671..000000000
--- a/tests/screenshot/test_cases/math_number
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_number"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_number_property b/tests/screenshot/test_cases/math_number_property
deleted file mode 100644
index dea4718fd..000000000
--- a/tests/screenshot/test_cases/math_number_property
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_number_property"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_on_list b/tests/screenshot/test_cases/math_on_list
deleted file mode 100644
index ecdb664a2..000000000
--- a/tests/screenshot/test_cases/math_on_list
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_on_list"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_random_float b/tests/screenshot/test_cases/math_random_float
deleted file mode 100644
index f2ea40d93..000000000
--- a/tests/screenshot/test_cases/math_random_float
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_random_float"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_random_int b/tests/screenshot/test_cases/math_random_int
deleted file mode 100644
index d655f9b62..000000000
--- a/tests/screenshot/test_cases/math_random_int
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_random_int"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_round b/tests/screenshot/test_cases/math_round
deleted file mode 100644
index 2811cc105..000000000
--- a/tests/screenshot/test_cases/math_round
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_round"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_single b/tests/screenshot/test_cases/math_single
deleted file mode 100644
index a9a4fba42..000000000
--- a/tests/screenshot/test_cases/math_single
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_single"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/math_subtraction b/tests/screenshot/test_cases/math_subtraction
deleted file mode 100644
index 81d331d8c..000000000
--- a/tests/screenshot/test_cases/math_subtraction
+++ /dev/null
@@ -1,15 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_arithmetic">
-    <field name="OP">MINUS</field>
-    <value name="A">
-      <shadow type="math_number">
-        <field name="NUM">3</field>
-      </shadow>
-    </value>
-    <value name="B">
-      <shadow type="math_number">
-        <field name="NUM">4</field>
-      </shadow>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/math_trig b/tests/screenshot/test_cases/math_trig
deleted file mode 100644
index 4be7fd358..000000000
--- a/tests/screenshot/test_cases/math_trig
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="math_trig"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/multi_block_1 b/tests/screenshot/test_cases/multi_block_1
deleted file mode 100644
index c094a75a0..000000000
--- a/tests/screenshot/test_cases/multi_block_1
+++ /dev/null
@@ -1,74 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <variables>
-    <variable id=";yuq?=_C|_qk64!)f:m^">item</variable>
-  </variables>
-  <block type="controls_ifelse">
-    <statement name="ELSE">
-      <block type="controls_ifelse">
-        <value name="IF0">
-          <block type="logic_compare">
-            <field name="OP">EQ</field>
-            <value name="A">
-              <block type="logic_negate">
-                <value name="BOOL">
-                  <block type="logic_boolean">
-                    <field name="BOOL">TRUE</field>
-                  </block>
-                </value>
-              </block>
-            </value>
-            <value name="B">
-              <block type="logic_compare">
-                <field name="OP">EQ</field>
-                <value name="A">
-                  <block type="math_arithmetic">
-                    <field name="OP">MULTIPLY</field>
-                    <value name="A">
-                      <shadow type="math_number">
-                        <field name="NUM">-1</field>
-                      </shadow>
-                    </value>
-                    <value name="B">
-                      <shadow type="math_number">
-                        <field name="NUM">42</field>
-                      </shadow>
-                    </value>
-                  </block>
-                </value>
-              </block>
-            </value>
-          </block>
-        </value>
-        <statement name="DO0">
-          <block type="controls_repeat_ext">
-            <value name="TIMES">
-              <shadow type="math_number">
-                <field name="NUM">900</field>
-              </shadow>
-            </value>
-          </block>
-        </statement>
-        <statement name="ELSE">
-          <block type="text_append">
-            <field name="VAR" id=";yuq?=_C|_qk64!)f:m^">item</field>
-            <value name="TEXT">
-              <shadow type="text">
-                <field name="TEXT">f00</field>
-              </shadow>
-            </value>
-            <next>
-              <block type="text_append">
-                <field name="VAR" id=";yuq?=_C|_qk64!)f:m^">item</field>
-                <value name="TEXT">
-                  <shadow type="text">
-                    <field name="TEXT">bar</field>
-                  </shadow>
-                </value>
-              </block>
-            </next>
-          </block>
-        </statement>
-      </block>
-    </statement>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/multi_block_logic b/tests/screenshot/test_cases/multi_block_logic
deleted file mode 100644
index 89579f6ab..000000000
--- a/tests/screenshot/test_cases/multi_block_logic
+++ /dev/null
@@ -1,34 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_compare">
-    <field name="OP">EQ</field>
-    <value name="A">
-      <block type="logic_negate">
-        <value name="BOOL">
-          <block type="logic_boolean">
-            <field name="BOOL">TRUE</field>
-          </block>
-        </value>
-      </block>
-    </value>
-    <value name="B">
-      <block type="logic_compare">
-        <field name="OP">EQ</field>
-        <value name="A">
-          <block type="math_arithmetic">
-            <field name="OP">MULTIPLY</field>
-            <value name="A">
-              <shadow type="math_number">
-                <field name="NUM">-1</field>
-              </shadow>
-            </value>
-            <value name="B">
-              <shadow type="math_number">
-                <field name="NUM">42</field>
-              </shadow>
-            </value>
-          </block>
-        </value>
-      </block>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/multi_colour_with_external b/tests/screenshot/test_cases/multi_colour_with_external
deleted file mode 100644
index 58e20248f..000000000
--- a/tests/screenshot/test_cases/multi_colour_with_external
+++ /dev/null
@@ -1,44 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_rgb">
-    <value name="RED">
-      <shadow type="math_number">
-        <field name="NUM">100</field>
-      </shadow>
-      <block type="math_modulo">
-        <value name="DIVIDEND">
-          <shadow type="math_number">
-            <field name="NUM">64</field>
-          </shadow>
-        </value>
-        <value name="DIVISOR">
-          <shadow type="math_number">
-            <field name="NUM">10</field>
-          </shadow>
-        </value>
-      </block>
-    </value>
-    <value name="GREEN">
-      <shadow type="math_number">
-        <field name="NUM">50</field>
-      </shadow>
-    </value>
-    <value name="BLUE">
-      <shadow type="math_number">
-        <field name="NUM">0</field>
-      </shadow>
-      <block type="math_arithmetic">
-        <field name="OP">ADD</field>
-        <value name="A">
-          <shadow type="math_number">
-            <field name="NUM">1</field>
-          </shadow>
-        </value>
-        <value name="B">
-          <shadow type="math_number">
-            <field name="NUM">1</field>
-          </shadow>
-        </value>
-      </block>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/multi_colour_with_internal b/tests/screenshot/test_cases/multi_colour_with_internal
deleted file mode 100644
index 040128d1d..000000000
--- a/tests/screenshot/test_cases/multi_colour_with_internal
+++ /dev/null
@@ -1,44 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="colour_rgb" inline="true">
-    <value name="RED">
-      <shadow type="math_number">
-        <field name="NUM">100</field>
-      </shadow>
-      <block type="math_modulo">
-        <value name="DIVIDEND">
-          <shadow type="math_number">
-            <field name="NUM">64</field>
-          </shadow>
-        </value>
-        <value name="DIVISOR">
-          <shadow type="math_number">
-            <field name="NUM">10</field>
-          </shadow>
-        </value>
-      </block>
-    </value>
-    <value name="GREEN">
-      <shadow type="math_number">
-        <field name="NUM">50</field>
-      </shadow>
-    </value>
-    <value name="BLUE">
-      <shadow type="math_number">
-        <field name="NUM">0</field>
-      </shadow>
-      <block type="math_arithmetic">
-        <field name="OP">ADD</field>
-        <value name="A">
-          <shadow type="math_number">
-            <field name="NUM">1</field>
-          </shadow>
-        </value>
-        <value name="B">
-          <shadow type="math_number">
-            <field name="NUM">1</field>
-          </shadow>
-        </value>
-      </block>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/multi_stack b/tests/screenshot/test_cases/multi_stack
deleted file mode 100644
index a56d7860f..000000000
--- a/tests/screenshot/test_cases/multi_stack
+++ /dev/null
@@ -1,53 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <variables>
-    <variable id="YUz?xxnE}SFx_,jmW#s;">item</variable>
-  </variables>
-  <block type="text_append">
-    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
-    <value name="TEXT">
-      <shadow type="text">
-        <field name="TEXT">one</field>
-      </shadow>
-    </value>
-    <next>
-      <block type="text_append">
-        <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
-        <value name="TEXT">
-          <shadow type="text">
-            <field name="TEXT">two</field>
-          </shadow>
-        </value>
-        <next>
-          <block type="text_append">
-            <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
-            <value name="TEXT">
-              <shadow type="text">
-                <field name="TEXT">three</field>
-              </shadow>
-            </value>
-            <next>
-              <block type="text_append">
-                <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
-                <value name="TEXT">
-                  <shadow type="text">
-                    <field name="TEXT">four</field>
-                  </shadow>
-                </value>
-                <next>
-                  <block type="text_append">
-                    <field name="VAR" id="YUz?xxnE}SFx_,jmW#s;">item</field>
-                    <value name="TEXT">
-                      <shadow type="text">
-                        <field name="TEXT">five</field>
-                      </shadow>
-                    </value>
-                  </block>
-                </next>
-              </block>
-            </next>
-          </block>
-        </next>
-      </block>
-    </next>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/not_true b/tests/screenshot/test_cases/not_true
deleted file mode 100644
index b8955956e..000000000
--- a/tests/screenshot/test_cases/not_true
+++ /dev/null
@@ -1,9 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="logic_negate">
-    <value name="BOOL">
-      <block type="logic_boolean">
-        <field name="BOOL">TRUE</field>
-      </block>
-    </value>
-  </block>
-</xml>
diff --git a/tests/screenshot/test_cases/procedures_callnoreturn b/tests/screenshot/test_cases/procedures_callnoreturn
deleted file mode 100644
index 4e4939e5b..000000000
--- a/tests/screenshot/test_cases/procedures_callnoreturn
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_callnoreturn"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_callreturn b/tests/screenshot/test_cases/procedures_callreturn
deleted file mode 100644
index f0ae0a187..000000000
--- a/tests/screenshot/test_cases/procedures_callreturn
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_callreturn"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_defnoreturn b/tests/screenshot/test_cases/procedures_defnoreturn
deleted file mode 100644
index 4bdfa70b9..000000000
--- a/tests/screenshot/test_cases/procedures_defnoreturn
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_defnoreturn"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_defreturn b/tests/screenshot/test_cases/procedures_defreturn
deleted file mode 100644
index 7b73e3289..000000000
--- a/tests/screenshot/test_cases/procedures_defreturn
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_defreturn"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_ifreturn b/tests/screenshot/test_cases/procedures_ifreturn
deleted file mode 100644
index a2a66238f..000000000
--- a/tests/screenshot/test_cases/procedures_ifreturn
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_ifreturn"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_mutatorarg b/tests/screenshot/test_cases/procedures_mutatorarg
deleted file mode 100644
index 99252558f..000000000
--- a/tests/screenshot/test_cases/procedures_mutatorarg
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_mutatorarg"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/procedures_mutatorcontainer b/tests/screenshot/test_cases/procedures_mutatorcontainer
deleted file mode 100644
index 9600d2006..000000000
--- a/tests/screenshot/test_cases/procedures_mutatorcontainer
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="procedures_mutatorcontainer"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_empty b/tests/screenshot/test_cases/test_basic_empty
deleted file mode 100644
index 166f7990e..000000000
--- a/tests/screenshot/test_cases/test_basic_empty
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_basic_empty"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_empty_with_mutator b/tests/screenshot/test_cases/test_basic_empty_with_mutator
deleted file mode 100644
index 4b8293f8c..000000000
--- a/tests/screenshot/test_cases/test_basic_empty_with_mutator
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_basic_empty_with_mutator"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_limit_instances b/tests/screenshot/test_cases/test_basic_limit_instances
deleted file mode 100644
index 498ae9967..000000000
--- a/tests/screenshot/test_cases/test_basic_limit_instances
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_basic_limit_instances"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_value_to_stack b/tests/screenshot/test_cases/test_basic_value_to_stack
deleted file mode 100644
index 56dd4ff27..000000000
--- a/tests/screenshot/test_cases/test_basic_value_to_stack
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_basic_value_to_stack"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_basic_value_to_statement b/tests/screenshot/test_cases/test_basic_value_to_statement
deleted file mode 100644
index ac133d16f..000000000
--- a/tests/screenshot/test_cases/test_basic_value_to_statement
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_basic_value_to_statement"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_cases.json b/tests/screenshot/test_cases/test_cases.json
deleted file mode 100644
index 904cca64a..000000000
--- a/tests/screenshot/test_cases/test_cases.json
+++ /dev/null
@@ -1,480 +0,0 @@
-{
-  "tests": [
-    {
-      "title": "logic_boolean",
-      "skip": false
-    },
-    {
-      "title": "controls_if",
-      "skip": false
-    },
-    {
-      "title": "controls_ifelse",
-      "skip": false
-    },
-    {
-      "title": "logic_compare",
-      "skip": false
-    },
-    {
-      "title": "logic_operation",
-      "skip": false
-    },
-    {
-      "title": "logic_negate",
-      "skip": false
-    },
-    {
-      "title": "logic_null",
-      "skip": false
-    },
-    {
-      "title": "logic_ternary",
-      "skip": false
-    },
-    {
-      "title": "controls_if_if",
-      "skip": false
-    },
-    {
-      "title": "controls_if_elseif",
-      "skip": false
-    },
-    {
-      "title": "controls_if_else",
-      "skip": false
-    },
-    {
-      "title": "controls_repeat_ext",
-      "skip": false
-    },
-    {
-      "title": "controls_repeat",
-      "skip": false
-    },
-    {
-      "title": "controls_whileUntil",
-      "skip": false
-    },
-    {
-      "title": "controls_for",
-      "skip": false
-    },
-    {
-      "title": "controls_forEach",
-      "skip": false
-    },
-    {
-      "title": "controls_flow_statements",
-      "skip": false
-    },
-    {
-      "title": "math_number",
-      "skip": false
-    },
-    {
-      "title": "math_arithmetic",
-      "skip": false
-    },
-    {
-      "title": "math_single",
-      "skip": false
-    },
-    {
-      "title": "math_trig",
-      "skip": false
-    },
-    {
-      "title": "math_constant",
-      "skip": false
-    },
-    {
-      "title": "math_number_property",
-      "skip": false
-    },
-    {
-      "title": "math_change",
-      "skip": false
-    },
-    {
-      "title": "math_round",
-      "skip": false
-    },
-    {
-      "title": "math_on_list",
-      "skip": false
-    },
-    {
-      "title": "math_modulo",
-      "skip": false
-    },
-    {
-      "title": "math_constrain",
-      "skip": false
-    },
-    {
-      "title": "math_random_int",
-      "skip": false
-    },
-    {
-      "title": "math_random_float",
-      "skip": false
-    },
-    {
-      "title": "math_atan2",
-      "skip": false
-    },
-    {
-      "title": "text_join",
-      "skip": false
-    },
-    {
-      "title": "text_create_join_container",
-      "skip": false
-    },
-    {
-      "title": "text_create_join_item",
-      "skip": false
-    },
-    {
-      "title": "text_append",
-      "skip": false
-    },
-    {
-      "title": "text_length",
-      "skip": false
-    },
-    {
-      "title": "text_isEmpty",
-      "skip": false
-    },
-    {
-      "title": "text_indexOf",
-      "skip": false
-    },
-    {
-      "title": "text_charAt",
-      "skip": false
-    },
-    {
-      "title": "text_getSubstring",
-      "skip": false
-    },
-    {
-      "title": "text_changeCase",
-      "skip": false
-    },
-    {
-      "title": "text_trim",
-      "skip": false
-    },
-    {
-      "title": "text_print",
-      "skip": false
-    },
-    {
-      "title": "text_prompt_ext",
-      "skip": false
-    },
-    {
-      "title": "text_prompt",
-      "skip": false
-    },
-    {
-      "title": "text_count",
-      "skip": false
-    },
-    {
-      "title": "text_replace",
-      "skip": false
-    },
-    {
-      "title": "text_reverse",
-      "skip": false
-    },
-    {
-      "title": "lists_create_empty",
-      "skip": false
-    },
-    {
-      "title": "lists_repeat",
-      "skip": false
-    },
-    {
-      "title": "lists_reverse",
-      "skip": false
-    },
-    {
-      "title": "lists_isEmpty",
-      "skip": false
-    },
-    {
-      "title": "lists_length",
-      "skip": false
-    },
-    {
-      "title": "lists_create_with",
-      "skip": false
-    },
-    {
-      "title": "lists_create_with_container",
-      "skip": false
-    },
-    {
-      "title": "lists_create_with_item",
-      "skip": false
-    },
-    {
-      "title": "lists_indexOf",
-      "skip": false
-    },
-    {
-      "title": "lists_getIndex",
-      "skip": false
-    },
-    {
-      "title": "lists_setIndex",
-      "skip": false
-    },
-    {
-      "title": "lists_getSublist",
-      "skip": false
-    },
-    {
-      "title": "lists_sort",
-      "skip": false
-    },
-    {
-      "title": "lists_split",
-      "skip": false
-    },
-    {
-      "title": "colour_picker",
-      "skip": false
-    },
-    {
-      "title": "colour_random",
-      "skip": false
-    },
-    {
-      "title": "colour_rgb",
-      "skip": false
-    },
-    {
-      "title": "colour_blend",
-      "skip": false
-    },
-    {
-      "title": "variables_get",
-      "skip": false
-    },
-    {
-      "title": "variables_set",
-      "skip": false
-    },
-    {
-      "title": "variables_get_dynamic",
-      "skip": false
-    },
-    {
-      "title": "variables_set_dynamic",
-      "skip": false
-    },
-    {
-      "title": "procedures_defnoreturn",
-      "skip": true
-    },
-    {
-      "title": "procedures_defreturn",
-      "skip": true
-    },
-    {
-      "title": "procedures_mutatorcontainer",
-      "skip": true
-    },
-    {
-      "title": "procedures_mutatorarg",
-      "skip": true
-    },
-    {
-      "title": "procedures_callnoreturn",
-      "skip": true
-    },
-    {
-      "title": "procedures_callreturn",
-      "skip": true
-    },
-    {
-      "title": "procedures_ifreturn",
-      "skip": true
-    },
-    {
-      "title": "test_basic_empty",
-      "skip": false
-    },
-    {
-      "title": "test_basic_value_to_stack",
-      "skip": false
-    },
-    {
-      "title": "test_basic_value_to_statement",
-      "skip": false
-    },
-    {
-      "title": "test_basic_limit_instances",
-      "skip": false
-    },
-    {
-      "title": "test_dropdowns_long",
-      "skip": false
-    },
-    {
-      "title": "test_dropdowns_images",
-      "skip": false
-    },
-    {
-      "title": "test_dropdowns_images_and_text",
-      "skip": false
-    },
-    {
-      "title": "test_fields_angle",
-      "skip": false
-    },
-    {
-      "title": "test_fields_date",
-      "skip": false
-    },
-    {
-      "title": "test_fields_text_input",
-      "skip": false
-    },
-    {
-      "title": "test_fields_checkbox",
-      "skip": false
-    },
-    {
-      "title": "test_fields_colour",
-      "skip": false
-    },
-    {
-      "title": "test_fields_variable",
-      "skip": false
-    },
-    {
-      "title": "test_fields_label_serializable",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_float",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_whole",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_hundredths",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_halves",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_three_halves",
-      "skip": false
-    },
-    {
-      "title": "test_numbers_whole_bounded",
-      "skip": false
-    },
-    {
-      "title": "test_images_datauri",
-      "skip": false
-    },
-    {
-      "title": "test_images_small",
-      "skip": false
-    },
-    {
-      "title": "test_images_large",
-      "skip": false
-    },
-    {
-      "title": "test_images_fliprtl",
-      "skip": false
-    },
-    {
-      "title": "test_images_missing",
-      "skip": false
-    },
-    {
-      "title": "test_images_many_icons",
-      "skip": false
-    },
-    {
-      "title": "test_style_hat",
-      "skip": false
-    },
-    {
-      "title": "test_style_hex1",
-      "skip": false
-    },
-    {
-      "title": "test_style_hex2",
-      "skip": false
-    },
-    {
-      "title": "test_style_hex3",
-      "skip": false
-    },
-    {
-      "title": "test_style_no_colour",
-      "skip": false
-    },
-    {
-      "title": "test_style_hex4",
-      "skip": false
-    },
-    {
-      "title": "test_style_hex5",
-      "skip": false
-    },
-    {
-      "title": "test_style_emoji",
-      "skip": false
-    },
-    {
-      "title": "test_basic_empty_with_mutator",
-      "skip": false
-    },
-    {
-      "title": "test_dropdowns_dynamic",
-      "skip": false
-    },
-    {
-      "title": "multi_block_1",
-      "skip": false
-    },
-    {
-      "title": "multi_block_logic",
-      "skip": false
-    },
-    {
-      "title": "multi_colour_with_external",
-      "skip": false
-    },
-    {
-      "title": "multi_colour_with_internal",
-      "skip": false
-    },
-    {
-      "title": "not_true",
-      "skip": false
-    },
-    {
-      "title": "multi_stack",
-      "skip": false
-    }
-  ]
-}
diff --git a/tests/screenshot/test_cases/test_dropdowns_dynamic b/tests/screenshot/test_cases/test_dropdowns_dynamic
deleted file mode 100644
index 3c40077bd..000000000
--- a/tests/screenshot/test_cases/test_dropdowns_dynamic
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_dropdowns_dynamic"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_images b/tests/screenshot/test_cases/test_dropdowns_images
deleted file mode 100644
index 496dcf96b..000000000
--- a/tests/screenshot/test_cases/test_dropdowns_images
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_dropdowns_images"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_images_and_text b/tests/screenshot/test_cases/test_dropdowns_images_and_text
deleted file mode 100644
index 1edeac8a4..000000000
--- a/tests/screenshot/test_cases/test_dropdowns_images_and_text
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_dropdowns_images_and_text"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_dropdowns_long b/tests/screenshot/test_cases/test_dropdowns_long
deleted file mode 100644
index 914c7620c..000000000
--- a/tests/screenshot/test_cases/test_dropdowns_long
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_dropdowns_long"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_angle b/tests/screenshot/test_cases/test_fields_angle
deleted file mode 100644
index 772d6d97c..000000000
--- a/tests/screenshot/test_cases/test_fields_angle
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_angle"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_checkbox b/tests/screenshot/test_cases/test_fields_checkbox
deleted file mode 100644
index 5b440ecaf..000000000
--- a/tests/screenshot/test_cases/test_fields_checkbox
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_checkbox"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_colour b/tests/screenshot/test_cases/test_fields_colour
deleted file mode 100644
index 72cb5c078..000000000
--- a/tests/screenshot/test_cases/test_fields_colour
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_colour"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_label_serializable b/tests/screenshot/test_cases/test_fields_label_serializable
deleted file mode 100644
index 14e08f121..000000000
--- a/tests/screenshot/test_cases/test_fields_label_serializable
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_label_serializable"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_text_input b/tests/screenshot/test_cases/test_fields_text_input
deleted file mode 100644
index 6aeb44399..000000000
--- a/tests/screenshot/test_cases/test_fields_text_input
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_text_input"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_fields_variable b/tests/screenshot/test_cases/test_fields_variable
deleted file mode 100644
index 9a1bd4337..000000000
--- a/tests/screenshot/test_cases/test_fields_variable
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_fields_variable"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_datauri b/tests/screenshot/test_cases/test_images_datauri
deleted file mode 100644
index 8dc9b0059..000000000
--- a/tests/screenshot/test_cases/test_images_datauri
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_datauri"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_fliprtl b/tests/screenshot/test_cases/test_images_fliprtl
deleted file mode 100644
index e666629c8..000000000
--- a/tests/screenshot/test_cases/test_images_fliprtl
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_fliprtl"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_large b/tests/screenshot/test_cases/test_images_large
deleted file mode 100644
index 43da93413..000000000
--- a/tests/screenshot/test_cases/test_images_large
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_large"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_many_icons b/tests/screenshot/test_cases/test_images_many_icons
deleted file mode 100644
index 9369bd14f..000000000
--- a/tests/screenshot/test_cases/test_images_many_icons
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_many_icons"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_missing b/tests/screenshot/test_cases/test_images_missing
deleted file mode 100644
index c194b5dab..000000000
--- a/tests/screenshot/test_cases/test_images_missing
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_missing"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_images_small b/tests/screenshot/test_cases/test_images_small
deleted file mode 100644
index e96d5bb3c..000000000
--- a/tests/screenshot/test_cases/test_images_small
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_images_small"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_float b/tests/screenshot/test_cases/test_numbers_float
deleted file mode 100644
index 65bbb5933..000000000
--- a/tests/screenshot/test_cases/test_numbers_float
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_float"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_halves b/tests/screenshot/test_cases/test_numbers_halves
deleted file mode 100644
index f531b0fa5..000000000
--- a/tests/screenshot/test_cases/test_numbers_halves
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_halves"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_hundredths b/tests/screenshot/test_cases/test_numbers_hundredths
deleted file mode 100644
index d00634857..000000000
--- a/tests/screenshot/test_cases/test_numbers_hundredths
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_hundredths"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_three_halves b/tests/screenshot/test_cases/test_numbers_three_halves
deleted file mode 100644
index e5bc698c8..000000000
--- a/tests/screenshot/test_cases/test_numbers_three_halves
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_three_halves"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_whole b/tests/screenshot/test_cases/test_numbers_whole
deleted file mode 100644
index 156d6a14e..000000000
--- a/tests/screenshot/test_cases/test_numbers_whole
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_whole"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_numbers_whole_bounded b/tests/screenshot/test_cases/test_numbers_whole_bounded
deleted file mode 100644
index bc59763d2..000000000
--- a/tests/screenshot/test_cases/test_numbers_whole_bounded
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_numbers_whole_bounded"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_emoji b/tests/screenshot/test_cases/test_style_emoji
deleted file mode 100644
index 3e04b918e..000000000
--- a/tests/screenshot/test_cases/test_style_emoji
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_emoji"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hat b/tests/screenshot/test_cases/test_style_hat
deleted file mode 100644
index f00141674..000000000
--- a/tests/screenshot/test_cases/test_style_hat
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hat"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex1 b/tests/screenshot/test_cases/test_style_hex1
deleted file mode 100644
index 02838254c..000000000
--- a/tests/screenshot/test_cases/test_style_hex1
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hex1"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex2 b/tests/screenshot/test_cases/test_style_hex2
deleted file mode 100644
index 2a1e8e0e9..000000000
--- a/tests/screenshot/test_cases/test_style_hex2
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hex2"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex3 b/tests/screenshot/test_cases/test_style_hex3
deleted file mode 100644
index 71164a404..000000000
--- a/tests/screenshot/test_cases/test_style_hex3
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hex3"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex4 b/tests/screenshot/test_cases/test_style_hex4
deleted file mode 100644
index 3f5033fba..000000000
--- a/tests/screenshot/test_cases/test_style_hex4
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hex4"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_hex5 b/tests/screenshot/test_cases/test_style_hex5
deleted file mode 100644
index 707b7a9dd..000000000
--- a/tests/screenshot/test_cases/test_style_hex5
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_hex5"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/test_style_no_colour b/tests/screenshot/test_cases/test_style_no_colour
deleted file mode 100644
index 21d5500d3..000000000
--- a/tests/screenshot/test_cases/test_style_no_colour
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="test_style_no_colour"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_append b/tests/screenshot/test_cases/text_append
deleted file mode 100644
index 99644abb5..000000000
--- a/tests/screenshot/test_cases/text_append
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_append"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_changeCase b/tests/screenshot/test_cases/text_changeCase
deleted file mode 100644
index 0f3f4577e..000000000
--- a/tests/screenshot/test_cases/text_changeCase
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_changeCase"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_charAt b/tests/screenshot/test_cases/text_charAt
deleted file mode 100644
index dbe1deed6..000000000
--- a/tests/screenshot/test_cases/text_charAt
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_charAt"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_count b/tests/screenshot/test_cases/text_count
deleted file mode 100644
index 854422037..000000000
--- a/tests/screenshot/test_cases/text_count
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_count"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_create_join_container b/tests/screenshot/test_cases/text_create_join_container
deleted file mode 100644
index 4758b1909..000000000
--- a/tests/screenshot/test_cases/text_create_join_container
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_create_join_container"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_create_join_item b/tests/screenshot/test_cases/text_create_join_item
deleted file mode 100644
index 23d853e5f..000000000
--- a/tests/screenshot/test_cases/text_create_join_item
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_create_join_item"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_getSubstring b/tests/screenshot/test_cases/text_getSubstring
deleted file mode 100644
index 20f7cff60..000000000
--- a/tests/screenshot/test_cases/text_getSubstring
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_getSubstring"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_indexOf b/tests/screenshot/test_cases/text_indexOf
deleted file mode 100644
index d41f4c1c0..000000000
--- a/tests/screenshot/test_cases/text_indexOf
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_indexOf"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_isEmpty b/tests/screenshot/test_cases/text_isEmpty
deleted file mode 100644
index 7b23edb2d..000000000
--- a/tests/screenshot/test_cases/text_isEmpty
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_isEmpty"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_join b/tests/screenshot/test_cases/text_join
deleted file mode 100644
index 46e7b47ef..000000000
--- a/tests/screenshot/test_cases/text_join
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_join"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_length b/tests/screenshot/test_cases/text_length
deleted file mode 100644
index d178d3b5e..000000000
--- a/tests/screenshot/test_cases/text_length
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_length"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_print b/tests/screenshot/test_cases/text_print
deleted file mode 100644
index 6d3923dcd..000000000
--- a/tests/screenshot/test_cases/text_print
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_print"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_prompt b/tests/screenshot/test_cases/text_prompt
deleted file mode 100644
index 0ec801ef9..000000000
--- a/tests/screenshot/test_cases/text_prompt
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_prompt"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_prompt_ext b/tests/screenshot/test_cases/text_prompt_ext
deleted file mode 100644
index dabe58a6a..000000000
--- a/tests/screenshot/test_cases/text_prompt_ext
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_prompt_ext"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_replace b/tests/screenshot/test_cases/text_replace
deleted file mode 100644
index a34419208..000000000
--- a/tests/screenshot/test_cases/text_replace
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_replace"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_reverse b/tests/screenshot/test_cases/text_reverse
deleted file mode 100644
index 61f53eb00..000000000
--- a/tests/screenshot/test_cases/text_reverse
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_reverse"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/text_trim b/tests/screenshot/test_cases/text_trim
deleted file mode 100644
index b37f36705..000000000
--- a/tests/screenshot/test_cases/text_trim
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="text_trim"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_get b/tests/screenshot/test_cases/variables_get
deleted file mode 100644
index 2599d1e93..000000000
--- a/tests/screenshot/test_cases/variables_get
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="variables_get"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_get_dynamic b/tests/screenshot/test_cases/variables_get_dynamic
deleted file mode 100644
index 5a9a3982e..000000000
--- a/tests/screenshot/test_cases/variables_get_dynamic
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="variables_get_dynamic"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_set b/tests/screenshot/test_cases/variables_set
deleted file mode 100644
index 23bcf4097..000000000
--- a/tests/screenshot/test_cases/variables_set
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="variables_set"></block>
-</xml>
\ No newline at end of file
diff --git a/tests/screenshot/test_cases/variables_set_dynamic b/tests/screenshot/test_cases/variables_set_dynamic
deleted file mode 100644
index 9d68c5f7f..000000000
--- a/tests/screenshot/test_cases/variables_set_dynamic
+++ /dev/null
@@ -1,3 +0,0 @@
-<xml xmlns="https://developers.google.com/blockly/xml">
-  <block type="variables_set_dynamic"></block>
-</xml>
\ No newline at end of file