diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/SingleInputComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/SingleInputComponent.jsx
index b8d86cb4a..331ae0c58 100644
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/SingleInputComponent.jsx
+++ b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/SingleInputComponent.jsx
@@ -22,17 +22,15 @@ function SingleInputComponent(props) {
         allowList,
         placeholder = _('Select a value'),
         dependencies,
-        // eslint-disable-next-line no-unused-vars
         createSearchChoice,
         referenceName,
-        // eslint-disable-next-line no-unused-vars
         disableSearch,
         labelField,
         autoCompleteFields,
     } = controlOptions;
 
-    function handleChange(e, { val }) {
-        restProps.handleChange(field, val);
+    function handleChange(e, { value }) {
+        restProps.handleChange(field, value);
     }
 
     function generateOptions(items) {
diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponent.jsx b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponent.jsx
deleted file mode 100644
index 87ed7b228..000000000
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponent.jsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import Button from '@splunk/react-ui/Button';
-import { StyledContainer, StyledGreeting } from './TestComponentStyles';
-import { axiosCallWrapper } from '../util/axiosCallWrapper';
-
-class TestComponent extends Component {
-    static propTypes = {
-        name: PropTypes.string,
-    };
-
-    static defaultProps = {
-        name: 'User',
-        serviceName: 'example_input_one',
-    };
-
-    constructor(props) {
-        super(props);
-        this.state = { counter: 0 };
-    }
-
-    componentDidMount() {
-        axiosCallWrapper(this.props.serviceName)
-            .then((response) => {
-                // eslint-disable-next-line no-console
-                console.log(response.data);
-            })
-            .catch((error) => {
-                // eslint-disable-next-line no-console
-                console.log(error);
-            });
-    }
-
-    render() {
-        const { name } = this.props;
-        const { counter } = this.state;
-
-        const message =
-            counter === 0
-                ? 'You should try clicking the button.'
-                : `You've clicked the button ${counter} time${counter > 1 ? 's' : ''}.`;
-
-        return (
-            <StyledContainer>
-                <StyledGreeting>Hello, {name}!</StyledGreeting>
-                <div>{message}</div>
-                <Button
-                    label="Click here"
-                    appearance="primary"
-                    onClick={() => {
-                        this.setState({ counter: counter + 1 });
-                    }}
-                />
-            </StyledContainer>
-        );
-    }
-}
-
-TestComponent.propTypes = {
-    serviceName: PropTypes.string,
-};
-export default TestComponent;
diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponentStyles.js b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponentStyles.js
deleted file mode 100644
index ff0a10d05..000000000
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/components/TestComponentStyles.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import styled from 'styled-components';
-import { variables, mixins } from '@splunk/themes';
-
-const StyledContainer = styled.div`
-    ${mixins.reset('inline-block')};
-    font-size: ${variables.fontSizeLarge};
-    line-height: 200%;
-    margin: ${variables.spacing} ${variables.spacingHalf};
-    padding: ${variables.spacing} calc(${variables.spacing} * 2);
-    border-radius: ${variables.borderRadius};
-    box-shadow: ${variables.overlayShadow};
-    background-color: ${variables.backgroundColor};
-`;
-
-const StyledGreeting = styled.div`
-    font-weight: bold;
-    color: ${variables.brandColor};
-    font-size: ${variables.fontSizeXXLarge};
-`;
-
-export { StyledContainer, StyledGreeting };
diff --git a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/util/Validator.js b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/util/Validator.js
index 7581349b3..407106ab0 100644
--- a/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/util/Validator.js
+++ b/splunk_add_on_ucc_framework/ucc_ui_lib/src/main/webapp/util/Validator.js
@@ -79,7 +79,7 @@ class Validator {
     }
 
     // Validate the custom component
-    static CustomValidator(validatorFunc, field, data) {
+    CustomValidator(validatorFunc, field, data) {
         const ret = validatorFunc(field, data);
         if (typeof ret === 'string') {
             return { errorField: field, errorMsg: ret };
@@ -242,7 +242,7 @@ class Validator {
                             }
                             break;
                         case 'custom':
-                            ret = this.CustomValidator(
+                            ret = Validator.CustomValidator(
                                 this.entities[i].validators[j].validatorFunc,
                                 this.entities[i].field,
                                 data[this.entities[i].field]