diff --git a/awx/ui_next/src/components/CollapsibleSection/ExpandingContainer.jsx b/awx/ui_next/src/components/CollapsibleSection/ExpandingContainer.jsx
index 8f8d982ac7..5d8c91ef0d 100644
--- a/awx/ui_next/src/components/CollapsibleSection/ExpandingContainer.jsx
+++ b/awx/ui_next/src/components/CollapsibleSection/ExpandingContainer.jsx
@@ -16,7 +16,7 @@ function ExpandingContainer({ isExpanded, children }) {
     ref.current.addEventListener('transitionend', () => {
       setHideOverflow(!isExpanded);
     });
-  })
+  });
   useEffect(() => {
     setContentHeight(ref.current.scrollHeight);
   });
diff --git a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx
index 3002319283..41f4aa5540 100644
--- a/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx
+++ b/awx/ui_next/src/components/MultiSelect/TagMultiSelect.test.jsx
@@ -18,17 +18,18 @@ describe('<TagMultiSelect />', () => {
     expect(wrapper.find('MultiSelect').prop('options')).toEqual([]);
   });
 
-  // NOTE: this test throws a warning which *should* be go away once we upgrade
-  // to React 16.8 (https://github.com/airbnb/enzyme/blob/master/docs/api/ReactWrapper/invoke.md)
   it('should trigger onChange', () => {
     const onChange = jest.fn();
     const wrapper = mount(
       <TagMultiSelect value="foo,bar" onChange={onChange} />
     );
 
-    const input = wrapper.find('TextInput');
-    input.invoke('onChange')('baz');
-    input.invoke('onKeyDown')({ key: 'Tab' });
+    const select = wrapper.find('MultiSelect');
+    select.invoke('onChange')([
+      { name: 'foo' },
+      { name: 'bar' },
+      { name: 'baz' },
+    ]);
     expect(onChange).toHaveBeenCalledWith('foo,bar,baz');
   });
 });
diff --git a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx
index e9a3572ffd..506b97958e 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateAdd/JobTemplateAdd.test.jsx
@@ -6,6 +6,27 @@ import { JobTemplatesAPI, LabelsAPI } from '@api';
 
 jest.mock('@api');
 
+const jobTemplateData = {
+  name: 'Foo',
+  description: 'Baz',
+  job_type: 'run',
+  inventory: 1,
+  project: 2,
+  playbook: 'Bar',
+  forks: 0,
+  limit: '',
+  verbosity: '0',
+  job_slice_count: 1,
+  timeout: 0,
+  job_tags: '',
+  skip_tags: '',
+  diff_mode: false,
+  allow_callbacks: false,
+  allow_simultaneous: false,
+  use_fact_cache: false,
+  host_config_key: '',
+};
+
 describe('<JobTemplateAdd />', () => {
   const defaultProps = {
     description: '',
@@ -62,18 +83,7 @@ describe('<JobTemplateAdd />', () => {
     done();
   });
 
-  test.only('handleSubmit should post to api', async done => {
-    const jobTemplateData = {
-      description: 'Baz',
-      inventory: 1,
-      job_type: 'run',
-      name: 'Foo',
-      playbook: 'Bar',
-      project: 2,
-      verbosity: '0',
-      job_tags: '',
-      skip_tags: '',
-    };
+  test('handleSubmit should post to api', async done => {
     JobTemplatesAPI.create.mockResolvedValueOnce({
       data: {
         id: 1,
@@ -102,17 +112,6 @@ describe('<JobTemplateAdd />', () => {
     const history = {
       push: jest.fn(),
     };
-    const jobTemplateData = {
-      description: 'Baz',
-      inventory: 1,
-      job_type: 'run',
-      name: 'Foo',
-      playbook: 'Bar',
-      project: 2,
-      verbosity: '0',
-      job_tags: '',
-      skip_tags: '',
-    };
     JobTemplatesAPI.create.mockResolvedValueOnce({
       data: {
         id: 1,
@@ -124,7 +123,9 @@ describe('<JobTemplateAdd />', () => {
       context: { router: { history } },
     });
 
-    await wrapper.find('JobTemplateForm').invoke('handleSubmit')(jobTemplateData);
+    await wrapper.find('JobTemplateForm').invoke('handleSubmit')(
+      jobTemplateData
+    );
     await sleep(0);
     expect(history.push).toHaveBeenCalledWith(
       '/templates/job_template/1/details'
diff --git a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
index 8be8a1eb74..3f43faf279 100644
--- a/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
+++ b/awx/ui_next/src/screens/Template/JobTemplateEdit/JobTemplateEdit.test.jsx
@@ -15,8 +15,18 @@ const mockJobTemplate = {
   project: 3,
   playbook: 'Baz',
   type: 'job_template',
+  forks: 0,
+  limit: '',
+  verbosity: '0',
+  job_slice_count: 1,
+  timeout: 0,
   job_tags: '',
   skip_tags: '',
+  diff_mode: false,
+  allow_callbacks: false,
+  allow_simultaneous: false,
+  use_fact_cache: false,
+  host_config_key: '',
   summary_fields: {
     user_capabilities: {
       edit: true,