diff --git a/Gemfile b/Gemfile
index 489d2bde51f4f..ee891ad7a6242 100644
--- a/Gemfile
+++ b/Gemfile
@@ -99,14 +99,14 @@ group :development, :test do
 
   # For UI testing.
   gem 'cucumber'
-  gem 'eyes_selenium'
+  gem 'eyes_selenium', '3.17.20'
   gem 'minitest', '~> 5.5'
   gem 'minitest-around'
   gem 'minitest-reporters', '~> 1.2.0.beta3'
   gem 'net-http-persistent'
   gem 'rinku'
   gem 'rspec'
-  gem 'selenium-webdriver'
+  gem 'selenium-webdriver', '3.141.0'
   gem 'spring'
   gem 'spring-commands-testunit'
   gem 'webdrivers', '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 26688837e3dc6..d68cb99bdb24d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -366,7 +366,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.4)
-    css_parser (1.7.0)
+    css_parser (1.7.1)
       addressable
     cucumber (3.1.1)
       builder (>= 2.1.2)
@@ -416,15 +416,20 @@ GEM
     eventmachine (1.2.5)
     execjs (2.7.0)
     exifr (1.2.5)
-    eyes_core (3.14.10)
+    eyes_core (3.17.20)
       chunky_png (= 1.3.6)
       faraday
+      faraday-cookie_jar
+      faraday_middleware
       oily_png (~> 1.2)
       oj
-    eyes_selenium (3.14.10)
+    eyes_selenium (3.17.20)
+      crass
       css_parser
-      eyes_core (= 3.14.10)
+      eyes_core (= 3.17.20)
+      nokogiri
       selenium-webdriver
+      state_machine
     factory_girl (4.7.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.7.0)
@@ -434,6 +439,11 @@ GEM
       redis (~> 3.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     firebase (0.2.6)
       httpclient
@@ -520,7 +530,7 @@ GEM
     jsonapi-serializers (1.0.0)
       activesupport
     jumphash (0.1.0)
-    jwt (2.1.0)
+    jwt (2.2.2)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -561,7 +571,7 @@ GEM
     multi_json (1.13.1)
     multi_test (0.1.2)
     multi_xml (0.5.5)
-    multipart-post (2.0.0)
+    multipart-post (2.1.1)
     mustermann (1.0.3)
     mysql2 (0.5.2)
     nakayoshi_fork (0.0.4)
@@ -574,7 +584,7 @@ GEM
     net_http_ssl_fix (0.0.10)
     netrc (0.11.0)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.1)
     oauth2 (1.4.1)
@@ -812,6 +822,7 @@ GEM
     sshkit (1.20.0)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    state_machine (1.2.0)
     stringex (2.5.2)
     swd (1.0.1)
       activesupport (>= 3)
@@ -833,8 +844,8 @@ GEM
     tilt (2.0.10)
     timecop (0.8.1)
     ttfunk (1.4.0)
-    twilio-ruby (5.20.1)
-      faraday (~> 0.9)
+    twilio-ruby (5.40.1)
+      faraday (>= 0.9, < 2.0)
       jwt (>= 1.5, <= 2.5)
       nokogiri (>= 1.6, < 2.0)
     tzinfo (1.2.5)
@@ -939,7 +950,7 @@ DEPENDENCIES
   devise_invitable (~> 1.6.0)
   dotiw
   execjs
-  eyes_selenium
+  eyes_selenium (= 3.17.20)
   factory_girl_rails
   fakeredis
   firebase
@@ -1039,7 +1050,7 @@ DEPENDENCIES
   scss_lint
   sdoc
   seamless_database_pool!
-  selenium-webdriver
+  selenium-webdriver (= 3.141.0)
   sequel
   shotgun
   simplecov (~> 0.9)
diff --git a/apps/src/blocklyAddons/cdoBlockSvg.js b/apps/src/blocklyAddons/cdoBlockSvg.js
new file mode 100644
index 0000000000000..8caab445bcb65
--- /dev/null
+++ b/apps/src/blocklyAddons/cdoBlockSvg.js
@@ -0,0 +1,25 @@
+import GoogleBlockly from 'blockly/core';
+
+export default class BlockSvg extends GoogleBlockly.BlockSvg {
+  getTitles() {
+    let fields = [];
+    this.inputList.forEach(input => {
+      input.fieldRow.forEach(field => {
+        fields.push(field);
+      });
+    });
+    return fields;
+  }
+
+  getTitleValue(name) {
+    return super.getFieldValue(name);
+  }
+
+  isUserVisible() {
+    return false; // TODO
+  }
+
+  setHSV(h, s, v) {
+    return super.setColour(Blockly.utils.colour.hsvToHex(h, s, v * 255));
+  }
+}
diff --git a/apps/src/blocklyAddons/cdoFieldDropdown.js b/apps/src/blocklyAddons/cdoFieldDropdown.js
new file mode 100644
index 0000000000000..ee6a8468c4745
--- /dev/null
+++ b/apps/src/blocklyAddons/cdoFieldDropdown.js
@@ -0,0 +1,19 @@
+import GoogleBlockly from 'blockly/core';
+
+export default class FieldDropdown extends GoogleBlockly.FieldDropdown {
+  constructor(menuGenerator, opt_changeHandler, opt_alwaysCallChangeHandler) {
+    let validator;
+    if (opt_changeHandler) {
+      validator = function(val) {
+        if (
+          this.getSourceBlock() &&
+          !this.getSourceBlock().isInsertionMarker_ &&
+          this.value_ !== val
+        ) {
+          opt_changeHandler(val);
+        }
+      };
+    }
+    super(menuGenerator, validator);
+  }
+}
diff --git a/apps/src/blocklyAddons/cdoInput.js b/apps/src/blocklyAddons/cdoInput.js
new file mode 100644
index 0000000000000..c1a84cfd6fa63
--- /dev/null
+++ b/apps/src/blocklyAddons/cdoInput.js
@@ -0,0 +1,7 @@
+import GoogleBlockly from 'blockly/core';
+
+export default class Input extends GoogleBlockly.Input {
+  appendTitle(a, b) {
+    return super.appendField(a, b);
+  }
+}
diff --git a/apps/src/blocklyAddons/cdoWorkspaceSvg.js b/apps/src/blocklyAddons/cdoWorkspaceSvg.js
new file mode 100644
index 0000000000000..580a2af7870f6
--- /dev/null
+++ b/apps/src/blocklyAddons/cdoWorkspaceSvg.js
@@ -0,0 +1,22 @@
+import GoogleBlockly from 'blockly/core';
+
+export default class WorkspaceSvg extends GoogleBlockly.WorkspaceSvg {
+  addUnusedBlocksHelpListener() {} // TODO
+  getAllUsedBlocks() {
+    return super.getAllBlocks();
+  }
+  getToolboxWidth() {
+    return Blockly.mainBlockSpace.getMetrics().toolboxWidth;
+  }
+  isReadOnly() {
+    return false; // TODO
+  }
+  setEnableToolbox() {} // TODO
+}
+
+WorkspaceSvg.prototype.blockSpaceEditor = {
+  blockLimits: {
+    blockLimitExceeded: () => false, // TODO
+    getLimit: () => {} // TODO
+  }
+};
diff --git a/apps/src/lib/levelbuilder/TextareaWithMarkdownPreview.jsx b/apps/src/lib/levelbuilder/TextareaWithMarkdownPreview.jsx
new file mode 100644
index 0000000000000..b6d12e238ddd3
--- /dev/null
+++ b/apps/src/lib/levelbuilder/TextareaWithMarkdownPreview.jsx
@@ -0,0 +1,71 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import SafeMarkdown from '@cdo/apps/templates/SafeMarkdown';
+import color from '@cdo/apps/util/color';
+
+const styles = {
+  box: {
+    marginTop: 10,
+    marginBottom: 10,
+    border: '1px solid ' + color.light_gray,
+    padding: 10
+  },
+  input: {
+    width: '100%',
+    boxSizing: 'border-box',
+    padding: '4px 6px',
+    color: '#555',
+    border: '1px solid #ccc',
+    borderRadius: 4,
+    margin: 0
+  }
+};
+
+/**
+ * Component for previewing Markdown for a edit field
+ */
+export default class TextareaWithMarkdownPreview extends React.Component {
+  static propTypes = {
+    markdown: PropTypes.string.isRequired,
+    label: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequired,
+    inputRows: PropTypes.number
+  };
+
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      markdown: this.props.markdown
+    };
+  }
+
+  handleMarkdownChange = event => {
+    this.setState({markdown: event.target.value});
+  };
+
+  render() {
+    return (
+      <label>
+        {this.props.label}
+        <div style={styles.box}>
+          <div style={{marginBottom: 5}}>Markdown:</div>
+          <textarea
+            name={this.props.name}
+            defaultValue={this.state.markdown}
+            rows={this.props.inputRows || 5}
+            style={styles.input}
+            onChange={this.handleMarkdownChange}
+          />
+          <div style={{marginBottom: 5}}>Preview:</div>
+          <div style={styles.box}>
+            <SafeMarkdown
+              openExternalLinksInNewTab={true}
+              markdown={this.state.markdown}
+            />
+          </div>
+        </div>
+      </label>
+    );
+  }
+}
diff --git a/apps/src/lib/levelbuilder/course-editor/CourseEditor.js b/apps/src/lib/levelbuilder/course-editor/CourseEditor.js
index f73e27817851d..102bef648db88 100644
--- a/apps/src/lib/levelbuilder/course-editor/CourseEditor.js
+++ b/apps/src/lib/levelbuilder/course-editor/CourseEditor.js
@@ -6,7 +6,7 @@ import {resourceShape} from '@cdo/apps/templates/courseOverview/resourceType';
 import VisibleAndPilotExperiment from '@cdo/apps/lib/levelbuilder/script-editor/VisibleAndPilotExperiment';
 import HelpTip from '@cdo/apps/lib/ui/HelpTip';
 import color from '@cdo/apps/util/color';
-import MarkdownPreview from '@cdo/apps/lib/levelbuilder/script-editor/MarkdownPreview';
+import TextareaWithMarkdownPreview from '@cdo/apps/lib/levelbuilder/TextareaWithMarkdownPreview';
 
 const styles = {
   input: {
@@ -53,23 +53,6 @@ export default class CourseEditor extends Component {
     versionYearOptions: PropTypes.arrayOf(PropTypes.string).isRequired
   };
 
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      descriptionStudent: this.props.descriptionStudent,
-      descriptionTeacher: this.props.descriptionTeacher
-    };
-  }
-
-  handleTeacherDescriptionChange = event => {
-    this.setState({descriptionTeacher: event.target.value});
-  };
-
-  handleStudentDescriptionChange = event => {
-    this.setState({descriptionStudent: event.target.value});
-  };
-
   render() {
     const {
       name,
@@ -134,28 +117,18 @@ export default class CourseEditor extends Component {
             style={styles.input}
           />
         </label>
-        <label>
-          Student Description
-          <textarea
-            name="description_student"
-            defaultValue={this.state.descriptionStudent}
-            rows={5}
-            style={styles.input}
-            onChange={this.handleStudentDescriptionChange}
-          />
-          <MarkdownPreview markdown={this.state.descriptionStudent} />
-        </label>
-        <label>
-          Teacher Description
-          <textarea
-            name="description_teacher"
-            defaultValue={this.state.descriptionTeacher}
-            rows={5}
-            style={styles.input}
-            onChange={this.handleTeacherDescriptionChange}
-          />
-          <MarkdownPreview markdown={this.state.descriptionTeacher} />
-        </label>
+        <TextareaWithMarkdownPreview
+          markdown={this.props.descriptionStudent}
+          label={'Student Description'}
+          name={'description_student'}
+          inputRows={5}
+        />
+        <TextareaWithMarkdownPreview
+          markdown={this.props.descriptionTeacher}
+          label={'Teacher Description'}
+          name={'description_teacher'}
+          inputRows={5}
+        />
         <h2>Basic settings</h2>
         <label>
           Verified Resources
diff --git a/apps/src/lib/levelbuilder/script-editor/MarkdownPreview.jsx b/apps/src/lib/levelbuilder/script-editor/MarkdownPreview.jsx
deleted file mode 100644
index 8e3eb14c75b11..0000000000000
--- a/apps/src/lib/levelbuilder/script-editor/MarkdownPreview.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import SafeMarkdown from '@cdo/apps/templates/SafeMarkdown';
-import color from '@cdo/apps/util/color';
-
-const styles = {
-  box: {
-    marginTop: 10,
-    marginBottom: 10,
-    border: '1px solid ' + color.light_gray,
-    padding: 10
-  }
-};
-
-/**
- * Component for previewing Markdown for a edit field
- */
-export default class MarkdownPreview extends React.Component {
-  static propTypes = {
-    markdown: PropTypes.string.isRequired
-  };
-
-  render() {
-    return (
-      <div>
-        <div style={{marginBottom: 5}}>Preview:</div>
-        <div style={styles.box}>
-          <SafeMarkdown
-            openExternalLinksInNewTab={true}
-            markdown={this.props.markdown}
-          />
-        </div>
-      </div>
-    );
-  }
-}
diff --git a/apps/src/lib/levelbuilder/script-editor/ScriptEditor.jsx b/apps/src/lib/levelbuilder/script-editor/ScriptEditor.jsx
index 90fa32f95cd0d..f9a9479bb3855 100644
--- a/apps/src/lib/levelbuilder/script-editor/ScriptEditor.jsx
+++ b/apps/src/lib/levelbuilder/script-editor/ScriptEditor.jsx
@@ -11,7 +11,7 @@ import VisibleAndPilotExperiment from '@cdo/apps/lib/levelbuilder/script-editor/
 import HelpTip from '@cdo/apps/lib/ui/HelpTip';
 import LessonExtrasEditor from '@cdo/apps/lib/levelbuilder/script-editor/LessonExtrasEditor';
 import color from '@cdo/apps/util/color';
-import MarkdownPreview from '@cdo/apps/lib/levelbuilder/script-editor/MarkdownPreview';
+import TextareaWithMarkdownPreview from '@cdo/apps/lib/levelbuilder/TextareaWithMarkdownPreview';
 
 const styles = {
   input: {
@@ -87,8 +87,7 @@ export default class ScriptEditor extends React.Component {
     super(props);
 
     this.state = {
-      curriculumUmbrella: this.props.curriculumUmbrella,
-      description: this.props.i18nData.description
+      curriculumUmbrella: this.props.curriculumUmbrella
     };
   }
 
@@ -122,10 +121,6 @@ export default class ScriptEditor extends React.Component {
     }
   };
 
-  handleDescriptionChange = event => {
-    this.setState({description: event.target.value});
-  };
-
   render() {
     const {betaWarning} = this.props;
     const textAreaRows = this.props.lessonLevelData
@@ -172,17 +167,12 @@ export default class ScriptEditor extends React.Component {
             style={styles.input}
           />
         </label>
-        <label>
-          Description
-          <textarea
-            name="description"
-            defaultValue={this.state.description}
-            rows={5}
-            style={styles.input}
-            onChange={this.handleDescriptionChange}
-          />
-          <MarkdownPreview markdown={this.state.description} />
-        </label>
+        <TextareaWithMarkdownPreview
+          markdown={this.props.i18nData.description}
+          label={'Description'}
+          name={'description'}
+          inputRows={5}
+        />
         <h2>Basic Settings</h2>
         <label>
           Require Login To Use
diff --git a/apps/src/sites/studio/pages/googleBlocklyWrapper.js b/apps/src/sites/studio/pages/googleBlocklyWrapper.js
index 9fd816f3a15e3..4478603fd6a81 100644
--- a/apps/src/sites/studio/pages/googleBlocklyWrapper.js
+++ b/apps/src/sites/studio/pages/googleBlocklyWrapper.js
@@ -1,4 +1,9 @@
 import {BlocklyVersion} from '@cdo/apps/constants';
+import CdoBlockSvg from '@cdo/apps/blocklyAddons/cdoBlockSvg';
+import CdoFieldDropdown from '@cdo/apps/blocklyAddons/cdoFieldDropdown';
+import CdoInput from '@cdo/apps/blocklyAddons/cdoInput';
+import CdoWorkspaceSvg from '@cdo/apps/blocklyAddons/cdoWorkspaceSvg';
+
 /**
  * Wrapper class for https://github.com/google/blockly
  * This wrapper will facilitate migrating from CDO Blockly to Google Blockly
@@ -54,6 +59,7 @@ function initializeBlocklyWrapper(blocklyInstance) {
   blocklyWrapper.wrapReadOnlyProperty('FieldButton');
   blocklyWrapper.wrapReadOnlyProperty('FieldColour');
   blocklyWrapper.wrapReadOnlyProperty('FieldColourDropdown');
+  blocklyWrapper.wrapReadOnlyProperty('FieldDropdown');
   blocklyWrapper.wrapReadOnlyProperty('FieldIcon');
   blocklyWrapper.wrapReadOnlyProperty('FieldImage');
   blocklyWrapper.wrapReadOnlyProperty('FieldImageDropdown');
@@ -94,26 +100,12 @@ function initializeBlocklyWrapper(blocklyInstance) {
   blocklyWrapper.wrapReadOnlyProperty('Variables');
   blocklyWrapper.wrapReadOnlyProperty('weblab_locale');
   blocklyWrapper.wrapReadOnlyProperty('Workspace');
+  blocklyWrapper.wrapReadOnlyProperty('Xml');
 
-  blocklyWrapper.FieldDropdown = function(
-    menuGenerator,
-    opt_changeHandler,
-    opt_alwaysCallChangeHandler
-  ) {
-    let validator;
-    if (opt_changeHandler) {
-      validator = function(val) {
-        if (
-          this.getSourceBlock() &&
-          !this.getSourceBlock().isInsertionMarker_ &&
-          this.value_ !== val
-        ) {
-          opt_changeHandler(val);
-        }
-      };
-    }
-    return new blocklyWrapper.blockly_.FieldDropdown(menuGenerator, validator);
-  };
+  blocklyWrapper.blockly_.BlockSvg = CdoBlockSvg;
+  blocklyWrapper.blockly_.FieldDropdown = CdoFieldDropdown;
+  blocklyWrapper.blockly_.Input = CdoInput;
+  blocklyWrapper.blockly_.WorkspaceSvg = CdoWorkspaceSvg;
 
   // These are also wrapping read only properties, but can't use wrapReadOnlyProperty
   // because the alias name is not the same as the underlying property name.
@@ -144,7 +136,6 @@ function initializeBlocklyWrapper(blocklyInstance) {
   blocklyWrapper.wrapSettableProperty('SNAP_RADIUS');
   blocklyWrapper.wrapSettableProperty('typeHints');
   blocklyWrapper.wrapSettableProperty('valueTypeTabShapeMap');
-  blocklyWrapper.wrapSettableProperty('Xml');
 
   blocklyWrapper.getGenerator = function() {
     return this.JavaScript;
@@ -162,26 +153,6 @@ function initializeBlocklyWrapper(blocklyInstance) {
     createReadOnlyBlockSpace: () => {} // TODO
   };
 
-  // CDO Blockly titles are equivalent to Google Blockly fields.
-  blocklyWrapper.Block.prototype.getTitles = function() {
-    let fields = [];
-    this.inputList.forEach(input => {
-      input.fieldRow.forEach(field => {
-        fields.push(field);
-      });
-    });
-    return fields;
-  };
-  blocklyWrapper.Block.prototype.getTitleValue =
-    blocklyWrapper.Block.prototype.getFieldValue;
-  blocklyWrapper.Block.prototype.isUserVisible = () => false; // TODO
-  // Google Blockly only allows you to set the hue, not saturation or value.
-  // However, they also allow you to specify the color in #RRGGBB format, so we can
-  // just map our HSV value to hex using their util function.
-  blocklyWrapper.Block.prototype.setHSV = function(h, s, v) {
-    return this.setColour(Blockly.utils.colour.hsvToHex(h, s, v * 255));
-  };
-
   // This function was a custom addition in CDO Blockly, so we need to add it here
   // so that our code generation logic still works with Google Blockly
   blocklyWrapper.Generator.blockSpaceToCode = function(name, opt_typeFilter) {
@@ -203,25 +174,6 @@ function initializeBlocklyWrapper(blocklyInstance) {
     return code.join('\n');
   };
 
-  blocklyWrapper.Input.prototype.appendTitle = function(a, b) {
-    return this.appendField(a, b);
-  };
-
-  blocklyWrapper.Workspace.prototype.getToolboxWidth = function() {
-    return blocklyWrapper.mainBlockSpace.getMetrics().toolboxWidth;
-  };
-  blocklyWrapper.Workspace.prototype.addUnusedBlocksHelpListener = () => {}; // TODO
-  blocklyWrapper.Workspace.prototype.getAllUsedBlocks =
-    blocklyWrapper.Workspace.prototype.getAllBlocks; // TODO
-  blocklyWrapper.Workspace.prototype.isReadOnly = () => false; // TODO
-  blocklyWrapper.Workspace.prototype.setEnableToolbox = () => {}; // TODO
-  blocklyWrapper.Workspace.prototype.blockSpaceEditor = {
-    blockLimits: {
-      blockLimitExceeded: () => false, // TODO
-      getLimit: () => {} // TODO
-    }
-  };
-
   // Aliasing Google's blockToDom() so that we can override it, but still be able
   // to call Google's blockToDom() in the override function.
   blocklyWrapper.Xml.originalBlockToDom = blocklyWrapper.Xml.blockToDom;
@@ -232,12 +184,11 @@ function initializeBlocklyWrapper(blocklyInstance) {
     }
     return blockXml;
   };
-
-  blocklyWrapper.Xml = {
-    ...blocklyWrapper.Xml,
-    domToBlockSpace: blocklyWrapper.Xml.domToWorkspace,
-    blockSpaceToDom: blocklyWrapper.Xml.workspaceToDom
+  blocklyWrapper.Xml.domToBlockSpace = function(blockSpace, xml) {
+    // Switch argument order
+    return blocklyWrapper.Xml.domToWorkspace(xml, blockSpace);
   };
+  blocklyWrapper.Xml.blockSpaceToDom = blocklyWrapper.Xml.workspaceToDom;
 
   return blocklyWrapper;
 }
diff --git a/apps/src/templates/instructions/InstructionsCSF.jsx b/apps/src/templates/instructions/InstructionsCSF.jsx
index 58b474542f921..368d506f2927a 100644
--- a/apps/src/templates/instructions/InstructionsCSF.jsx
+++ b/apps/src/templates/instructions/InstructionsCSF.jsx
@@ -262,7 +262,8 @@ class InstructionsCSF extends React.Component {
         this.instructions
       ).getElementsByTagName('img');
       for (let i = 0, image; (image = images[i]); i++) {
-        image.onload = image.onload || this.scrollInstructionsToBottom;
+        image.onload =
+          image.onload || this.scrollInstructionsToBottom.bind(this);
       }
     }
 
diff --git a/apps/test/unit/lib/levelbuilder/TextareaWithMarkdownPreviewTest.jsx b/apps/test/unit/lib/levelbuilder/TextareaWithMarkdownPreviewTest.jsx
new file mode 100644
index 0000000000000..66a137aa7bf50
--- /dev/null
+++ b/apps/test/unit/lib/levelbuilder/TextareaWithMarkdownPreviewTest.jsx
@@ -0,0 +1,32 @@
+import {expect} from 'chai';
+import React from 'react';
+import {mount} from 'enzyme';
+import TextareaWithMarkdownPreview from '@cdo/apps/lib/levelbuilder/TextareaWithMarkdownPreview';
+
+const DEFAULT_PROPS = {
+  label: 'Section Name',
+  name: 'name',
+  markdown:
+    '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
+};
+
+describe('TextareaWithMarkdownPreview', () => {
+  it('has correct markdown for preview of unit description', () => {
+    const wrapper = mount(<TextareaWithMarkdownPreview {...DEFAULT_PROPS} />);
+    expect(wrapper.contains('Section Name'));
+    expect(wrapper.find('textarea').length).to.equal(1);
+    expect(wrapper.find('textarea').prop('defaultValue')).to.equal(
+      '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
+    );
+    expect(wrapper.find('textarea').prop('name')).to.equal('name');
+    expect(wrapper.find('SafeMarkdown').length).to.equal(1);
+    expect(wrapper.find('SafeMarkdown').prop('markdown')).to.equal(
+      '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
+    );
+
+    wrapper
+      .find('textarea[name="name"]')
+      .simulate('change', {target: {value: '## Title'}});
+    expect(wrapper.find('SafeMarkdown').prop('markdown')).to.equal('## Title');
+  });
+});
diff --git a/apps/test/unit/lib/levelbuilder/course-editor/CourseEditorTest.js b/apps/test/unit/lib/levelbuilder/course-editor/CourseEditorTest.js
index 73855fdfe9ca6..3915ef0fd474d 100644
--- a/apps/test/unit/lib/levelbuilder/course-editor/CourseEditorTest.js
+++ b/apps/test/unit/lib/levelbuilder/course-editor/CourseEditorTest.js
@@ -61,10 +61,10 @@ describe('CourseEditor', () => {
 
   it('has correct markdown for preview of course teacher and student description', () => {
     const wrapper = createWrapper({});
-    expect(wrapper.find('MarkdownPreview').length).to.equal(2);
+    expect(wrapper.find('TextareaWithMarkdownPreview').length).to.equal(2);
     expect(
       wrapper
-        .find('MarkdownPreview')
+        .find('TextareaWithMarkdownPreview')
         .at(0)
         .prop('markdown')
     ).to.equal(
@@ -72,31 +72,12 @@ describe('CourseEditor', () => {
     );
     expect(
       wrapper
-        .find('MarkdownPreview')
+        .find('TextareaWithMarkdownPreview')
         .at(1)
         .prop('markdown')
     ).to.equal(
       '# Teacher description \n This is the course description with [link](https://studio.code.org/home) **Bold** *italics* '
     );
-
-    wrapper
-      .find('textarea[name="description_student"]')
-      .simulate('change', {target: {value: '## Title 1'}});
-    expect(
-      wrapper
-        .find('MarkdownPreview')
-        .at(0)
-        .prop('markdown')
-    ).to.equal('## Title 1');
-    wrapper
-      .find('textarea[name="description_teacher"]')
-      .simulate('change', {target: {value: '## Title 2'}});
-    expect(
-      wrapper
-        .find('MarkdownPreview')
-        .at(1)
-        .prop('markdown')
-    ).to.equal('## Title 2');
   });
 
   describe('VisibleInTeacherDashboard', () => {
diff --git a/apps/test/unit/lib/levelbuilder/script-editor/MarkdownPreviewTest.jsx b/apps/test/unit/lib/levelbuilder/script-editor/MarkdownPreviewTest.jsx
deleted file mode 100644
index bee22a8e9e35e..0000000000000
--- a/apps/test/unit/lib/levelbuilder/script-editor/MarkdownPreviewTest.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import {expect} from 'chai';
-import React from 'react';
-import {mount} from 'enzyme';
-import MarkdownPreview from '@cdo/apps/lib/levelbuilder/script-editor/MarkdownPreview';
-
-const DEFAULT_PROPS = {
-  markdown:
-    '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
-};
-
-describe('ScriptEditor', () => {
-  it('has correct markdown for preview of unit description', () => {
-    const wrapper = mount(<MarkdownPreview {...DEFAULT_PROPS} />);
-    expect(wrapper.find('SafeMarkdown').length).to.equal(1);
-    expect(wrapper.find('SafeMarkdown').prop('markdown')).to.equal(
-      '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
-    );
-  });
-});
diff --git a/apps/test/unit/lib/levelbuilder/script-editor/ScriptEditorTest.jsx b/apps/test/unit/lib/levelbuilder/script-editor/ScriptEditorTest.jsx
index d300f27943cdc..9b3e5ebbe1787 100644
--- a/apps/test/unit/lib/levelbuilder/script-editor/ScriptEditorTest.jsx
+++ b/apps/test/unit/lib/levelbuilder/script-editor/ScriptEditorTest.jsx
@@ -31,17 +31,12 @@ describe('ScriptEditor', () => {
 
     it('has correct markdown for preview of unit description', () => {
       const wrapper = mount(<ScriptEditor {...DEFAULT_PROPS} hidden={false} />);
-      expect(wrapper.find('MarkdownPreview').length).to.equal(1);
-      expect(wrapper.find('MarkdownPreview').prop('markdown')).to.equal(
+      expect(wrapper.find('TextareaWithMarkdownPreview').length).to.equal(1);
+      expect(
+        wrapper.find('TextareaWithMarkdownPreview').prop('markdown')
+      ).to.equal(
         '# Title \n This is the unit description with [link](https://studio.code.org/home) **Bold** *italics*'
       );
-
-      wrapper
-        .find('textarea[name="description"]')
-        .simulate('change', {target: {value: '## Title'}});
-      expect(wrapper.find('MarkdownPreview').prop('markdown')).to.equal(
-        '## Title'
-      );
     });
   });
 
diff --git a/bin/i18n/create-prs.rb b/bin/i18n/create-prs.rb
new file mode 100644
index 0000000000000..ffefcc62080c4
--- /dev/null
+++ b/bin/i18n/create-prs.rb
@@ -0,0 +1,154 @@
+require_relative '../../lib/cdo/github'
+
+IN_UP_BRANCH = "i18n-sync-in-up-#{Date.today.strftime('%m-%d-%Y')}".freeze
+DOWN_OUT_BRANCH = "i18n-sync-down-out-#{Date.today.strftime('%m-%d-%Y')}".freeze
+
+class CreateI18nPullRequests
+  def self.in_and_up
+    `git checkout -B #{IN_UP_BRANCH}`
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "dashboard/config/locales/*.en.yml",
+        "i18n/locales/source/dashboard"
+      ],
+      "dashboard i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/course_content"
+      ],
+      "course content i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/pegasus",
+      ],
+      "pegasus i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/blockly-mooc",
+      ],
+      "apps i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/animations"
+      ],
+      "animation library i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/hourofcode/",
+      ],
+      "hoc i18n sync"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/source/markdown/",
+      ],
+      "pegasus markdown i18n sync"
+    )
+
+    `git push origin #{IN_UP_BRANCH}`
+    in_up_pr = GitHub.create_pull_request(
+      base: 'staging',
+      head: IN_UP_BRANCH,
+      body: File.read(File.join(__dir__, 'templates/i18n_sync_in_up.md')),
+      title: "I18n sync In & Up #{Date.today.strftime('%m/%d')}"
+    )
+    GitHub.label_pull_request(in_up_pr, ["i18n"])
+    puts "Created In & Up PR: #{GitHub.url(in_up_pr)}"
+  end
+
+  def self.down_and_out
+    `git checkout -B #{DOWN_OUT_BRANCH}`
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "bin/i18n/crowdin/*etags.json"
+      ],
+      "etags updates"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "pegasus/cache",
+        "i18n/locales/*-*/pegasus",
+      ],
+      "pegasus i18n updates"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "pegasus/sites.v3/code.org/i18n",
+      ],
+      "pegasus i18n markdown updates"
+    )
+
+    # Break up the dashboard changes, since they frequently end up being large
+    # enough to have trouble viewing in github
+    Languages.get_crowdin_name_and_locale.each do |prop|
+      locale = prop[:locale_s]
+      next if locale == 'en-US'
+      I18nScriptUtils.git_add_and_commit(
+        [
+          "dashboard/config/locales/*#{locale}.json",
+          "dashboard/config/locales/*#{locale}.yml",
+          "i18n/locales/#{locale}/dashboard",
+        ],
+        "dashboard i18n updates - #{prop[:crowdin_name_s]}"
+      )
+    end
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "apps/i18n/*/*.json",
+        "i18n/locales/*-*/blockly-mooc",
+      ],
+      "apps i18n updates"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "apps/lib/blockly/*.js",
+        "i18n/locales/*-*/blockly-core",
+      ],
+      "blockly i18n updates"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/*-*/animations"
+      ],
+      "animation library i18n updates"
+    )
+
+    I18nScriptUtils.git_add_and_commit(
+      [
+        "i18n/locales/*-*/hourofcode/",
+        "pegasus/sites.v3/hourofcode.com/i18n/*.yml",
+        "pegasus/sites.v3/hourofcode.com/i18n/public/*/"
+      ],
+      "hoc i18n updates"
+    )
+
+    `git push origin #{DOWN_OUT_BRANCH}`
+    down_out_pr = GitHub.create_pull_request(
+      base: 'staging',
+      head: DOWN_OUT_BRANCH,
+      body: File.read(File.join(__dir__, 'templates/i18n_sync_down_out.md')),
+      title: "I18n sync Down & Out #{Date.today.strftime('%m/%d')}"
+    )
+    GitHub.label_pull_request(down_out_pr, ["i18n"])
+
+    puts "Created Down & Out PR: #{GitHub.url(down_out_pr)}"
+  end
+end
diff --git a/bin/i18n/sync-all.rb b/bin/i18n/sync-all.rb
index dd2edcf9e82b5..3ec35446fee34 100755
--- a/bin/i18n/sync-all.rb
+++ b/bin/i18n/sync-all.rb
@@ -22,7 +22,6 @@
 # the full sync
 
 require_relative '../../deployment'
-require_relative '../../lib/cdo/github'
 
 require_relative 'i18n_script_utils'
 
@@ -30,12 +29,10 @@
 require_relative 'sync-up'
 require_relative 'sync-down'
 require_relative 'sync-out'
+require_relative 'create-prs'
 
 require 'optparse'
 
-IN_UP_BRANCH = "i18n-sync-in-up-#{Date.today.strftime('%m-%d-%Y')}".freeze
-DOWN_OUT_BRANCH = "i18n-sync-down-out-#{Date.today.strftime('%m-%d-%Y')}".freeze
-
 class I18nSync
   def initialize(args)
     @options = parse_options(args)
@@ -46,18 +43,18 @@ def run
       checkout_staging
       sync_in if should_i "sync in"
       sync_up if should_i "sync up"
-      create_in_up_pr if @options[:with_pull_request]
+      CreateI18nPullRequests.in_and_up if @options[:with_pull_request] && should_i("create the in & up PR")
       sync_down if should_i "sync down"
       sync_out(true) if should_i "sync out"
-      create_down_out_pr if @options[:with_pull_request]
+      CreateI18nPullRequests.down_and_out if @options[:with_pull_request] && should_i("create the down & out PR")
       checkout_staging
     elsif @options[:command]
       case @options[:command]
       when 'in'
         puts "Pulling all updated source strings into i18n/locales/sources"
         sync_in
-        if @options[:with_pull_request]
-          create_in_up_pr
+        if @options[:with_pull_request] && should_i("create the in & up PR")
+          CreateI18nPullRequests.in_and_up
         end
       when 'up'
         puts "Uploading i18n/locales/sources to crowdin"
@@ -68,8 +65,8 @@ def run
       when 'out'
         puts "Distributing translations from i18n/locales out into codebase"
         sync_out(true)
-        if @options[:with_pull_request]
-          create_down_out_pr
+        if @options[:with_pull_request] && should_i("create the down & out PR")
+          CreateI18nPullRequests.down_and_out
         end
       end
     end
@@ -139,159 +136,6 @@ def should_i(question)
     end
   end
 
-  def create_in_up_pr
-    return unless should_i "create the in & up PR"
-    `git checkout -B #{IN_UP_BRANCH}`
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "dashboard/config/locales/*.en.yml",
-        "i18n/locales/source/dashboard"
-      ],
-      "dashboard i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/course_content"
-      ],
-      "course content i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/pegasus",
-      ],
-      "pegasus i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/blockly-mooc",
-      ],
-      "apps i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/animations"
-      ],
-      "animation library i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/hourofcode/",
-      ],
-      "hoc i18n sync"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/source/markdown/",
-      ],
-      "pegasus markdown i18n sync"
-    )
-
-    `git push origin #{IN_UP_BRANCH}`
-    in_up_pr = GitHub.create_pull_request(
-      base: 'staging',
-      head: IN_UP_BRANCH,
-      body: File.read(File.join(__dir__, 'templates/i18n_sync_in_up.md')),
-      title: "I18n sync In & Up #{Date.today.strftime('%m/%d')}"
-    )
-    GitHub.label_pull_request(in_up_pr, ["i18n"])
-    puts "Created In & Up PR: #{GitHub.url(in_up_pr)}"
-  end
-
-  def create_down_out_pr
-    return unless should_i "create the down & out PR"
-    `git checkout -B #{DOWN_OUT_BRANCH}`
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "bin/i18n/crowdin/*etags.json"
-      ],
-      "etags updates"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "pegasus/cache",
-        "i18n/locales/*-*/pegasus",
-      ],
-      "pegasus i18n updates"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "pegasus/sites.v3/code.org/i18n",
-      ],
-      "pegasus i18n markdown updates"
-    )
-
-    # Break up the dashboard changes, since they frequently end up being large
-    # enough to have trouble viewing in github
-    Languages.get_crowdin_name_and_locale.each do |prop|
-      locale = prop[:locale_s]
-      next if locale == 'en-US'
-      I18nScriptUtils.git_add_and_commit(
-        [
-          "dashboard/config/locales/*#{locale}.json",
-          "dashboard/config/locales/*#{locale}.yml",
-          "i18n/locales/#{locale}/dashboard",
-        ],
-        "dashboard i18n updates - #{prop[:crowdin_name_s]}"
-      )
-    end
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "apps/i18n/*/*.json",
-        "i18n/locales/*-*/blockly-mooc",
-      ],
-      "apps i18n updates"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "apps/lib/blockly/*.js",
-        "i18n/locales/*-*/blockly-core",
-      ],
-      "blockly i18n updates"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/*-*/animations"
-      ],
-      "animation library i18n updates"
-    )
-
-    I18nScriptUtils.git_add_and_commit(
-      [
-        "i18n/locales/*-*/hourofcode/",
-        "pegasus/sites.v3/hourofcode.com/i18n/*.yml",
-        "pegasus/sites.v3/hourofcode.com/i18n/public/*/"
-      ],
-      "hoc i18n updates"
-    )
-
-    `git push origin #{DOWN_OUT_BRANCH}`
-    down_out_pr = GitHub.create_pull_request(
-      base: 'staging',
-      head: DOWN_OUT_BRANCH,
-      body: File.read(File.join(__dir__, 'templates/i18n_sync_down_out.md')),
-      title: "I18n sync Down & Out #{Date.today.strftime('%m/%d')}"
-    )
-    GitHub.label_pull_request(down_out_pr, ["i18n"])
-
-    puts "Created Down & Out PR: #{GitHub.url(down_out_pr)}"
-
-    # TODO: automate blockly update, too
-    puts "\r\rremember to update blockly\r\r"
-  end
-
   def checkout_staging
     return if GitUtils.current_branch == "staging"
     `git checkout staging` if should_i "switch to staging branch"
diff --git a/dashboard/app/models/authentication_option.rb b/dashboard/app/models/authentication_option.rb
index 9a78026b09b4d..817021fcdbb11 100644
--- a/dashboard/app/models/authentication_option.rb
+++ b/dashboard/app/models/authentication_option.rb
@@ -33,7 +33,8 @@ class AuthenticationOption < ApplicationRecord
   validates_email_format_of :email, allow_blank: true, if: :email_changed?, unless: -> {email.to_s.utf8mb4?}
 
   validate :email_must_be_unique, :hashed_email_must_be_unique, unless: -> {UNTRUSTED_EMAIL_CREDENTIAL_TYPES.include? credential_type}
-  validate :cred_type_and_auth_id_must_be_unique
+
+  validates :authentication_id, uniqueness: {scope: [:credential_type, :deleted_at]}
 
   after_create :set_primary_contact_info
 
@@ -183,16 +184,4 @@ def update_oauth_credential_tokens(credentials)
       errors.add :email, I18n.t('errors.messages.taken')
     end
   end
-
-  private def cred_type_and_auth_id_must_be_unique
-    # skip the db lookup if possible
-    return unless authentication_id.present? &&
-      (credential_type_changed? || authentication_id_changed?) &&
-      errors.blank?
-
-    other = User.find_by_credential(type: credential_type, id: authentication_id)
-    if other && other != user
-      errors.add :credential_type, I18n.t('errors.messages.taken')
-    end
-  end
 end
diff --git a/dashboard/app/models/lesson.rb b/dashboard/app/models/lesson.rb
index e87f308c8ec4e..6803a965f2b75 100644
--- a/dashboard/app/models/lesson.rb
+++ b/dashboard/app/models/lesson.rb
@@ -49,7 +49,6 @@ class Lesson < ActiveRecord::Base
   # by a non-lockable lesson, the third lesson will have an absolute_position of 3 but a relative_position of 1
   acts_as_list scope: :script, column: :absolute_position
 
-  #validates_uniqueness_of :name, scope: :script_id TODO: Add this back after we have moved over to new key/name systems for lesson
   validates_uniqueness_of :key, scope: :script_id
 
   include CodespanOnlyMarkdownHelper
diff --git a/dashboard/test/controllers/api/v1/pd/regional_partner_workshops_controller_test.rb b/dashboard/test/controllers/api/v1/pd/regional_partner_workshops_controller_test.rb
index 8ffc13e5df2ec..3fd96bd13fb4b 100644
--- a/dashboard/test/controllers/api/v1/pd/regional_partner_workshops_controller_test.rb
+++ b/dashboard/test/controllers/api/v1/pd/regional_partner_workshops_controller_test.rb
@@ -151,6 +151,14 @@ class RegionalPartnerWorkshopsControllerTest < ::ActionController::TestCase
       get :find, params: {state: 'Washington DC'}
     end
 
+    test 'find returns correctly when no partner is found' do
+      sign_in @teacher
+      get :find, params: {state: 'somewhere'}
+
+      expected = {id: nil, name: nil, group: nil, workshops: nil, has_csf: nil}.stringify_keys
+      assert_equal expected, JSON.parse(response.body)
+    end
+
     private
 
     def workshop_in_index_results(expected_workshop)
diff --git a/dashboard/test/factories/factories.rb b/dashboard/test/factories/factories.rb
index 8071a723ce0ac..971299eb13119 100644
--- a/dashboard/test/factories/factories.rb
+++ b/dashboard/test/factories/factories.rb
@@ -72,7 +72,7 @@
 
   factory :user do
     birthday Time.zone.today - 21.years
-    email {("#{user_type}_#{(User.maximum(:id) || 0) + 1}@code.org")}
+    email {("#{user_type}_#{SecureRandom.uuid}@code.org")}
     password "00secret"
     locale 'en-US'
     sequence(:name) {|n| "User#{n} Codeberg"}
@@ -386,7 +386,7 @@
           email: user.email,
           hashed_email: user.hashed_email,
           credential_type: AuthenticationOption::GOOGLE,
-          authentication_id: "abcd#{user.id}",
+          authentication_id: SecureRandom.uuid,
           data: {
             oauth_token: 'some-google-token',
             oauth_refresh_token: 'some-google-refresh-token',
@@ -403,7 +403,7 @@
           email: user.email,
           hashed_email: user.hashed_email,
           credential_type: AuthenticationOption::CLEVER,
-          authentication_id: '456efgh',
+          authentication_id: SecureRandom.uuid,
           data: {
             oauth_token: 'some-clever-token'
           }.to_json
@@ -447,7 +447,7 @@
     association :user
     sequence(:email) {|n| "testuser#{n}@example.com.xx"}
     credential_type AuthenticationOption::EMAIL
-    authentication_id {User.hash_email email}
+    authentication_id SecureRandom.uuid
 
     factory :google_authentication_option do
       credential_type AuthenticationOption::GOOGLE
diff --git a/dashboard/test/lib/user_multi_auth_helper_test.rb b/dashboard/test/lib/user_multi_auth_helper_test.rb
index 7446d8323daf1..28d07b19276cd 100644
--- a/dashboard/test/lib/user_multi_auth_helper_test.rb
+++ b/dashboard/test/lib/user_multi_auth_helper_test.rb
@@ -20,13 +20,17 @@ class UserMultiAuthHelperTest < ActiveSupport::TestCase
   test 'oauth_tokens_for_provider returns most recently updated tokens for migrated teacher' do
     Timecop.freeze do
       user = create :teacher
-      create :authentication_option, credential_type: AuthenticationOption::CLEVER, user: user, data: {
-        oauth_token: 'old-clever-token'
-      }.to_json
+      create :authentication_option,
+        authentication_id: "old-auth-id",
+        credential_type: AuthenticationOption::CLEVER,
+        user: user,
+        data: {oauth_token: 'old-clever-token'}.to_json
       Timecop.travel(1.minute) do
-        create :authentication_option, credential_type: AuthenticationOption::CLEVER, user: user, data: {
-          oauth_token: 'newer-clever-token'
-        }.to_json
+        create :authentication_option,
+          authentication_id: "newer-auth-id",
+          credential_type: AuthenticationOption::CLEVER,
+          user: user,
+          data: {oauth_token: 'newer-clever-token'}.to_json
         clever_token = user.oauth_tokens_for_provider(AuthenticationOption::CLEVER)[:oauth_token]
         assert_equal 'newer-clever-token', clever_token
       end
diff --git a/dashboard/test/models/authentication_option_test.rb b/dashboard/test/models/authentication_option_test.rb
index f49cb1202af1c..db034ddf004fb 100644
--- a/dashboard/test/models/authentication_option_test.rb
+++ b/dashboard/test/models/authentication_option_test.rb
@@ -29,7 +29,7 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
     teacher_email = 'TESTcaseSANITIZATION@test.com'
     sanitized = 'testcasesanitization@test.com'
     teacher = create(:teacher, email: teacher_email)
-    email_auth = create(:authentication_option, user: teacher, email: teacher_email)
+    email_auth = teacher.primary_contact_info
     assert_equal sanitized, email_auth.email
     assert_equal email_auth.hashed_email, AuthenticationOption.hash_email(sanitized)
   end
@@ -37,7 +37,7 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
   test 'student email is not stored but hashed_email is' do
     student_email = 'teststudent@test.com'
     student = create(:student, email: student_email)
-    email_auth = create(:authentication_option, user: student, email: student_email)
+    email_auth = student.primary_contact_info
     assert email_auth.user.student?
     assert_equal '', email_auth.email
     assert_equal student.hashed_email, email_auth.hashed_email
@@ -49,7 +49,17 @@ class AuthenticationOptionTest < ActiveSupport::TestCase
     create :authentication_option, credential_type: cred_type, authentication_id: auth_id
     new_auth_option = build :authentication_option, credential_type: cred_type, authentication_id: auth_id
     refute new_auth_option.valid?
-    assert_equal ['Credential type has already been taken'], new_auth_option.errors.full_messages
+    assert_equal ['Authentication has already been taken'], new_auth_option.errors.full_messages
+  end
+
+  test 'deleted authentication options do not affect uniqueness' do
+    cred_type = AuthenticationOption::GOOGLE
+    auth_id = '54321'
+    first_auth_option = create :authentication_option, credential_type: cred_type, authentication_id: auth_id
+    new_auth_option = build :authentication_option, credential_type: cred_type, authentication_id: auth_id
+    refute new_auth_option.valid?
+    first_auth_option.delete
+    assert new_auth_option.valid?
   end
 
   test 'user can have multiple authentication options' do
diff --git a/dashboard/test/models/user_test.rb b/dashboard/test/models/user_test.rb
index ddd12226e82ce..3e471a9c3af86 100644
--- a/dashboard/test/models/user_test.rb
+++ b/dashboard/test/models/user_test.rb
@@ -2933,10 +2933,10 @@ def track_progress(user_id, script_level, result, pairings: nil)
   end
 
   test "age is set exactly for Google OAuth users between ages 4 and 20" do
-    four_year_old = create :user, birthday: (Date.today - 4.years), provider: 'google_oauth2'
+    four_year_old = build :user, birthday: (Date.today - 4.years), provider: 'google_oauth2'
     assert_equal 4, four_year_old.age
 
-    twenty_year_old = create :user, birthday: (Date.today - 20.years), provider: 'google_oauth2'
+    twenty_year_old = build :user, birthday: (Date.today - 20.years), provider: 'google_oauth2'
     assert_equal 20, twenty_year_old.age
   end
 
@@ -2958,10 +2958,10 @@ def track_progress(user_id, script_level, result, pairings: nil)
   end
 
   test "age is set exactly for Clever users between ages 4 and 20" do
-    four_year_old = create :user, birthday: (Date.today - 4.years), provider: 'clever'
+    four_year_old = build :user, birthday: (Date.today - 4.years), provider: 'clever'
     assert_equal 4, four_year_old.age
 
-    twenty_year_old = create :user, birthday: (Date.today - 20.years), provider: 'clever'
+    twenty_year_old = build :user, birthday: (Date.today - 20.years), provider: 'clever'
     assert_equal 20, twenty_year_old.age
   end
 
diff --git a/dashboard/test/ui/features/eyes.feature b/dashboard/test/ui/features/eyes.feature
index 04a7f0171b0a8..7987310c11399 100644
--- a/dashboard/test/ui/features/eyes.feature
+++ b/dashboard/test/ui/features/eyes.feature
@@ -74,5 +74,5 @@ Scenario:
   And I close the instructions overlay if it exists
   And I see no difference for "star wars RTL"
   And I press "show-code-header"
-  And I see no difference for "star wars RTL text mode"
+  And I see no difference for "star wars RTL text mode" using stitch mode "none"
   And I close my eyes
diff --git a/dashboard/test/ui/features/hour_of_code/tutorial_landing_pages.feature b/dashboard/test/ui/features/hour_of_code/tutorial_landing_pages.feature
index 7f655c12c43a8..49a30f7f4dc5d 100644
--- a/dashboard/test/ui/features/hour_of_code/tutorial_landing_pages.feature
+++ b/dashboard/test/ui/features/hour_of_code/tutorial_landing_pages.feature
@@ -5,6 +5,7 @@ Feature: Looking at tutorial landing pages on Pegasus
 Scenario Outline: Simple page view
   When I open my eyes to test "<test_name>"
   And I am on "<url>"
+  And I dismiss the language selector
   When I rotate to landscape
   Then I see no difference for "initial load"
   And I close my eyes
diff --git a/dashboard/test/ui/features/initial_page_views2.feature b/dashboard/test/ui/features/initial_page_views2.feature
index b7c4f50260284..4bdbcdba2649c 100644
--- a/dashboard/test/ui/features/initial_page_views2.feature
+++ b/dashboard/test/ui/features/initial_page_views2.feature
@@ -19,7 +19,7 @@ Feature: Looking at a few things with Applitools Eyes - Part 2
     And I sign out
     Examples:
       | url                                                      | test_name                         | stitch_mode | user_type |
-      | http://studio.code.org/projects/applab/new               | new applab project                | scroll      | student   |
+      | http://studio.code.org/projects/applab/new               | new applab project                | none        | student   |
       | http://studio.code.org/                                  | logged in student studio homepage | css         | student   |
       | http://studio.code.org/                                  | logged in teacher studio homepage | css         | teacher   |
       | http://studio.code.org/s/allthethings                    | logged in script progress         | css         | student   |
diff --git a/dashboard/test/ui/features/initial_page_views3.feature b/dashboard/test/ui/features/initial_page_views3.feature
index 1c49425a297dc..bd16a239a5ea5 100644
--- a/dashboard/test/ui/features/initial_page_views3.feature
+++ b/dashboard/test/ui/features/initial_page_views3.feature
@@ -24,6 +24,7 @@ Feature: Looking at a few things with Applitools Eyes - Part 3
     Given I am on "http://studio.code.org/"
     When I open my eyes to test "<test_name>"
     And I am on "<url>"
+    And I dismiss the language selector
     When I rotate to landscape
     Then I see no difference for "initial load"
     And I close my eyes
@@ -38,6 +39,7 @@ Feature: Looking at a few things with Applitools Eyes - Part 3
     Given I am on "http://studio.code.org/"
     When I open my eyes to test "<test_name>"
     And I am on "<url>"
+    And I dismiss the language selector
     When I rotate to landscape
     Then I see no difference for "initial load"
     And I close my eyes
diff --git a/dashboard/test/ui/features/learning_platform/level_types/contained_levels.feature b/dashboard/test/ui/features/learning_platform/level_types/contained_levels.feature
index 6b5f2f9c007ef..3cc105bf8a7e5 100644
--- a/dashboard/test/ui/features/learning_platform/level_types/contained_levels.feature
+++ b/dashboard/test/ui/features/learning_platform/level_types/contained_levels.feature
@@ -34,11 +34,11 @@ Scenario: GameLab with a submittable contained level
   Given I am on "http://studio.code.org/s/allthethings/stage/41/puzzle/7"
   And I rotate to landscape
   And I wait for the page to fully load
-  Then I see no difference for "initial load"
+  Then I see no difference for "initial load" using stitch mode "none"
   Then I press "unchecked_0"
-  And I see no difference for "answer entered"
+  And I see no difference for "answer entered" using stitch mode "none"
   Then I press "runButton"
-  And I see no difference for "level run"
+  And I see no difference for "level run" using stitch mode "none"
   And I press "submitButton"
   And I press "confirm-button"
   And I wait until current URL contains "/stage/41/puzzle/8"
@@ -48,20 +48,20 @@ Scenario: Gamelab with multiple choice contained level
   Given I am on "http://studio.code.org/s/allthethings/stage/41/puzzle/2"
   And I rotate to landscape
   And I wait for the page to fully load
-  Then I see no difference for "initial load"
+  Then I see no difference for "initial load" using stitch mode "none"
   Then I press "unchecked_0"
-  And I see no difference for "answer entered"
+  And I see no difference for "answer entered" using stitch mode "none"
   Then I press "runButton"
-  And I see no difference for "level run"
+  And I see no difference for "level run" using stitch mode "none"
   # At this point, we should have submitted our result to the server, do
   # a reload and make sure we have the submission
   Then I am on "http://studio.code.org/s/allthethings/stage/41/puzzle/2"
   And I rotate to landscape
   And I wait for the page to fully load
-  And I see no difference for "reloaded with contained level answered"
+  And I see no difference for "reloaded with contained level answered" using stitch mode "none"
   Then I press "runButton"
   And I press "finishButton"
-  And I see no difference for "finished level with contained level"
+  And I see no difference for "finished level with contained level" using stitch mode "none"
   And I press "continue-button"
   # Make sure continue takes us to next level
   And I wait until current URL contains "/stage/41/puzzle/3"
diff --git a/dashboard/test/ui/features/other_sites.feature b/dashboard/test/ui/features/other_sites.feature
index 2ebc7ae054b42..b2c1c67432417 100644
--- a/dashboard/test/ui/features/other_sites.feature
+++ b/dashboard/test/ui/features/other_sites.feature
@@ -4,6 +4,7 @@ Feature: Looking at other Pegasus sites with Applitools Eyes
 Scenario Outline: Simple page view
   When I open my eyes to test "<test_name>"
   And I am on "<url>"
+  And I dismiss the language selector
   When I rotate to landscape
   Then I see no difference for "initial load"
   And I close my eyes
diff --git a/dashboard/test/ui/features/star_labs/applab/eyes1.feature b/dashboard/test/ui/features/star_labs/applab/eyes1.feature
index 1f4b6a41fbc9b..0ffc659ff5c36 100644
--- a/dashboard/test/ui/features/star_labs/applab/eyes1.feature
+++ b/dashboard/test/ui/features/star_labs/applab/eyes1.feature
@@ -6,17 +6,17 @@ Scenario: Design elements are visible in local and shared projects
   When I open my eyes to test "applab eyes"
   Given I start a new Applab project
   And I wait for the page to fully load
-  Then I see no difference for "initial load"
+  Then I see no difference for "initial load" using stitch mode "none"
   And I press "show-code-header"
   And I add code for a canvas and a button
   And I press "runButton"
-  Then I see no difference for "button should be visible"
+  Then I see no difference for "button should be visible" using stitch mode "none"
   And I click selector ".project_share"
   And I wait to see a dialog titled "Share your project"
-  Then I see no difference for "project share dialog"
+  Then I see no difference for "project share dialog" using stitch mode "none"
   And I navigate to the share URL
   And I wait until element "#divApplab" is visible
-  Then I see no difference for "app lab share"
+  Then I see no difference for "app lab share" using stitch mode "none"
   And I close my eyes
 
 Scenario: App Lab UI elements from initial code and html
diff --git a/dashboard/test/ui/features/star_labs/applab/eyes2.feature b/dashboard/test/ui/features/star_labs/applab/eyes2.feature
index c3e8080ba7f4d..06c2fdb3e4635 100644
--- a/dashboard/test/ui/features/star_labs/applab/eyes2.feature
+++ b/dashboard/test/ui/features/star_labs/applab/eyes2.feature
@@ -18,13 +18,13 @@ Scenario: Applab visualization scaling
   And I press "show-code-header"
   And I add code for a canvas and a button
   And I press "runButton"
-  And I see no difference for "medium scaling"
+  And I see no difference for "medium scaling" using stitch mode "none"
 
   Then I drag the visualization grippy by 100 pixels
-  And I see no difference for "large scaling"
+  And I see no difference for "large scaling" using stitch mode "none"
 
   Then I drag the visualization grippy by -400 pixels
-  And I see no difference for "small scaling"
+  And I see no difference for "small scaling" using stitch mode "none"
 
   Then I close my eyes
 
diff --git a/dashboard/test/ui/features/star_labs/applab/eyes3.feature b/dashboard/test/ui/features/star_labs/applab/eyes3.feature
index 5f652284a7ff9..bef7c2cae580e 100644
--- a/dashboard/test/ui/features/star_labs/applab/eyes3.feature
+++ b/dashboard/test/ui/features/star_labs/applab/eyes3.feature
@@ -6,7 +6,7 @@ Scenario: Data Browser
   Given I open my eyes to test "Applab Data Browser"
 
   When I start a new Applab project
-  Then I see no difference for "initial load"
+  Then I see no difference for "initial load" using stitch mode "none"
 
   When I switch to data mode
   Then I see no difference for "data overview"
diff --git a/dashboard/test/ui/features/star_labs/applab/eyes4.feature b/dashboard/test/ui/features/star_labs/applab/eyes4.feature
index dc20053aeecac..f26ce0683a556 100644
--- a/dashboard/test/ui/features/star_labs/applab/eyes4.feature
+++ b/dashboard/test/ui/features/star_labs/applab/eyes4.feature
@@ -9,16 +9,16 @@ Scenario: Applab debugging
   And I add code for a canvas and a button
   And I click selector "#debug-area-header .fa-chevron-circle-up"
   Then I press "stepInButton"
-  And I see no difference for "stepped in once"
+  And I see no difference for "stepped in once" using stitch mode "none"
   Then I press "stepInButton"
-  And I see no difference for "stepped in twice"
+  And I see no difference for "stepped in twice" using stitch mode "none"
   Then I press "stepInButton"
-  And I see no difference for "stepped in thrice"
+  And I see no difference for "stepped in thrice" using stitch mode "none"
   Then I press "show-code-header"
   And I wait to see Droplet block mode
   And I press "resetButton"
   And I click droplet gutter line 1
-  And I see no difference for "droplet breakpoint"
+  And I see no difference for "droplet breakpoint" using stitch mode "none"
   Then I close my eyes
 
 Scenario: Drag to delete
@@ -30,13 +30,13 @@ Scenario: Drag to delete
   And I set groupable input "xpos" to "0"
   And I set groupable input "ypos" to "0"
   And I drag element "#design_button1" 50 horizontally and 50 vertically
-  Then I see no difference for "dragging in app doesn't delete button"
+  Then I see no difference for "dragging in app doesn't delete button" using stitch mode "none"
 
   When I drag element "#design_button1" 250 horizontally and 100 vertically
-  Then I see no difference for "dragging slightly out of app leaves element partially out of bounds"
+  Then I see no difference for "dragging slightly out of app leaves element partially out of bounds" using stitch mode "none"
 
   When I drag element "#design_button1" 100 horizontally and 100 vertically
   And I wait until element "#design_button1" is gone
-  Then I see no difference for "dragging out of app deletes button"
+  Then I see no difference for "dragging out of app deletes button" using stitch mode "none"
 
   And I close my eyes
diff --git a/dashboard/test/ui/features/star_labs/applab/tooltips.feature b/dashboard/test/ui/features/star_labs/applab/tooltips.feature
index 26e8b1f769246..85b8ebf67d79b 100644
--- a/dashboard/test/ui/features/star_labs/applab/tooltips.feature
+++ b/dashboard/test/ui/features/star_labs/applab/tooltips.feature
@@ -41,47 +41,47 @@ Feature: Applab visualization overlay tooltips
     When I hover over element with id "design_text_area1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for text area"
+    Then I see no difference for "tooltip for text area" using stitch mode "none"
 
     When I hover over element with id "design_button1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for button"
+    Then I see no difference for "tooltip for button" using stitch mode "none"
 
     When I hover over element with id "design_label1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for label"
+    Then I see no difference for "tooltip for label" using stitch mode "none"
 
     When I hover over the screen at xpos 300 and ypos 100
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for blank screen area at (300, 100)"
+    Then I see no difference for "tooltip for blank screen area at (300, 100)" using stitch mode "none"
 
     When I hover over element with id "design_text_input1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for text input"
+    Then I see no difference for "tooltip for text input" using stitch mode "none"
 
     When I hover over element with id "design_radio_button1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for radio button"
+    Then I see no difference for "tooltip for radio button" using stitch mode "none"
 
     When I hover over element with id "design_checkbox1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for checkbox"
+    Then I see no difference for "tooltip for checkbox" using stitch mode "none"
 
     When I hover over element with id "design_image1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for image"
+    Then I see no difference for "tooltip for image" using stitch mode "none"
 
     When I hover over the screen at xpos 300 and ypos 200
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for blank screen area at (300, 200)"
+    Then I see no difference for "tooltip for blank screen area at (300, 200)" using stitch mode "none"
 
     And I close my eyes
 
@@ -94,41 +94,41 @@ Feature: Applab visualization overlay tooltips
     When I hover over element with id "text_area1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for text area"
+    Then I see no difference for "tooltip for text area" using stitch mode "none"
 
     When I hover over element with id "button1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for button"
+    Then I see no difference for "tooltip for button" using stitch mode "none"
 
     When I hover over element with id "label1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for label"
+    Then I see no difference for "tooltip for label" using stitch mode "none"
 
     When I hover over the screen at xpos 300 and ypos 100
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for blank screen area at (300, 100)"
+    Then I see no difference for "tooltip for blank screen area at (300, 100)" using stitch mode "none"
 
     When I hover over element with id "text_input1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for text input"
+    Then I see no difference for "tooltip for text input" using stitch mode "none"
 
     When I hover over element with id "radio_button1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for radio button"
+    Then I see no difference for "tooltip for radio button" using stitch mode "none"
 
     When I hover over element with id "checkbox1"
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for checkbox"
+    Then I see no difference for "tooltip for checkbox" using stitch mode "none"
 
     When I hover over the screen at xpos 300 and ypos 200
     And I save the project
     And I wait until element ".project_updated_at" contains text "Saved"
-    Then I see no difference for "tooltip for blank screen area at (300, 200)"
+    Then I see no difference for "tooltip for blank screen area at (300, 200)" using stitch mode "none"
 
     And I close my eyes
diff --git a/dashboard/test/ui/features/step_definitions/eyes_steps.rb b/dashboard/test/ui/features/step_definitions/eyes_steps.rb
index 402cf015b6ca3..ab79f005bfd8e 100644
--- a/dashboard/test/ui/features/step_definitions/eyes_steps.rb
+++ b/dashboard/test/ui/features/step_definitions/eyes_steps.rb
@@ -29,7 +29,7 @@
   @browser.capabilities[:takes_screenshot] = true
   @eyes.force_full_page_screenshot = true
   # Default stitch mode can be customized for each checkpoint in the I See No Difference step.
-  @eyes.stitch_mode = :css
+  @eyes.stitch_mode = Applitools::STITCH_MODE[:css]
 
   @eyes.open(config)
 end
@@ -50,10 +50,21 @@
 And(/^I see no difference for "([^"]*)"(?: using stitch mode "([^"]*)")?$/) do |identifier, stitch_mode|
   next if CDO.disable_all_eyes_running
 
-  @eyes.stitch_mode = (stitch_mode&.to_sym || :css)
-  @eyes.check_window(identifier, MATCH_TIMEOUT)
+  if stitch_mode === "none"
+    @eyes.force_full_page_screenshot = false
+  else
+    @eyes.stitch_mode = stitch_mode == "scroll" ?
+      Applitools::STITCH_MODE[:scroll] :
+      Applitools::STITCH_MODE[:css]
+  end
+
+  @eyes.check_window(identifier, MATCH_TIMEOUT, false)
+
+  # Return to full page screenshot for remaining checkpoints in this Scenario.
+  @eyes.force_full_page_screenshot = true
+
   # Return to default stitch mode for remaining checkpoints in this Scenario.
-  @eyes.stitch_mode = :css
+  @eyes.stitch_mode = Applitools::STITCH_MODE[:css]
 end
 
 def ensure_eyes_available
diff --git a/dashboard/test/ui/runner.rb b/dashboard/test/ui/runner.rb
index 56be65ca4b5c6..9ff75368560a6 100755
--- a/dashboard/test/ui/runner.rb
+++ b/dashboard/test/ui/runner.rb
@@ -730,7 +730,7 @@ def run_feature(browser, feature, options)
 
   # Force Applitools eyes to use a consistent host OS identifier for now
   # BrowserStack was reporting Windows 6.0 and 6.1, causing different baselines
-  run_environment['APPLITOOLS_HOST_OS'] = 'Windows 6x' unless browser['mobile']
+  run_environment['APPLITOOLS_HOST_OS'] = browser['mobile'] ? 'iOS 11.3' : 'Windows 6x'
 
   max_reruns = how_many_reruns?(test_run_string)
 
diff --git a/locals.yml.default b/locals.yml.default
index 482063522699d..054f128bc2206 100644
--- a/locals.yml.default
+++ b/locals.yml.default
@@ -108,3 +108,9 @@ use_my_apps: true
 # And this each time you need to start mailcatcher in the background again:
 #   `mailcatcher --ip=0.0.0.0`
 #use_mailcatcher: true
+
+
+# Credentials for Twilio, used to share projects to a phone number via SMS.
+#twilio_sid:
+#twilio_auth:
+#twilio_messaging_service: