diff --git a/src/tags/helpers/TagsSelector.tsx b/src/tags/helpers/TagsSelector.tsx
index b401f77f..21cd1cb8 100644
--- a/src/tags/helpers/TagsSelector.tsx
+++ b/src/tags/helpers/TagsSelector.tsx
@@ -25,9 +25,9 @@ const TagsSelector = (colorGenerator: ColorGenerator) => (
     listTags();
   }, []);
 
-  const renderTag = ({ tag, onDelete }: TagComponentProps) =>
+  const ReactTagsTag = ({ tag, onDelete }: TagComponentProps) =>
     <Tag colorGenerator={colorGenerator} text={tag.name} clearable className="react-tags__tag" onClose={onDelete} />;
-  const renderSuggestion = ({ item }: SuggestionComponentProps) => (
+  const ReactTagsSuggestion = ({ item }: SuggestionComponentProps) => (
     <>
       <TagBullet tag={`${item.name}`} colorGenerator={colorGenerator} />
       {item.name}
@@ -37,23 +37,20 @@ const TagsSelector = (colorGenerator: ColorGenerator) => (
   return (
     <ReactTags
       tags={selectedTags.map(toComponentTag)}
-      tagComponent={renderTag}
+      tagComponent={ReactTagsTag}
       suggestions={tagsList.tags.filter((tag) => !selectedTags.includes(tag)).map(toComponentTag)}
-      suggestionComponent={renderSuggestion}
+      suggestionComponent={ReactTagsSuggestion}
       allowNew
       addOnBlur
       placeholderText={placeholder}
       minQueryLength={1}
       onDelete={(removedTagIndex) => {
-        selectedTags.splice(removedTagIndex, 1);
+        const tagsCopy = [ ...selectedTags ];
 
-        onChange(selectedTags);
-      }}
-      onAddition={({ name: newTag }) => {
-        const tags = [ ...selectedTags, newTag.toLowerCase() ]; // eslint-disable-line @typescript-eslint/no-unsafe-call
-
-        onChange(tags);
+        tagsCopy.splice(removedTagIndex, 1);
+        onChange(tagsCopy);
       }}
+      onAddition={({ name: newTag }) => onChange([ ...selectedTags, newTag.toLowerCase() ])}
     />
   );
 };
diff --git a/test/tags/helpers/TagsSelector.test.tsx b/test/tags/helpers/TagsSelector.test.tsx
new file mode 100644
index 00000000..92725838
--- /dev/null
+++ b/test/tags/helpers/TagsSelector.test.tsx
@@ -0,0 +1,66 @@
+import { shallow, ShallowWrapper } from 'enzyme';
+import { Mock } from 'ts-mockery';
+import createTagsSelector from '../../../src/tags/helpers/TagsSelector';
+import ColorGenerator from '../../../src/utils/services/ColorGenerator';
+import { TagsList } from '../../../src/tags/reducers/tagsList';
+
+describe('<TagsSelector />', () => {
+  const onChange = jest.fn();
+  const TagsSelector = createTagsSelector(Mock.all<ColorGenerator>());
+  const tags = [ 'foo', 'bar' ];
+  const tagsList = Mock.of<TagsList>({ tags: [ ...tags, 'baz' ] });
+  let wrapper: ShallowWrapper;
+
+  beforeEach(jest.clearAllMocks);
+  beforeEach(() => {
+    wrapper = shallow(
+      <TagsSelector selectedTags={tags} tagsList={tagsList} listTags={jest.fn()} onChange={onChange} />,
+    );
+  });
+
+  afterEach(() => wrapper?.unmount());
+
+  it('has expected props', () => {
+    expect(wrapper.prop('placeholderText')).toEqual('Add tags to the URL');
+    expect(wrapper.prop('allowNew')).toEqual(true);
+    expect(wrapper.prop('addOnBlur')).toEqual(true);
+    expect(wrapper.prop('minQueryLength')).toEqual(1);
+  });
+
+  it('contains expected tags', () => {
+    expect(wrapper.prop('tags')).toEqual([
+      {
+        id: 'foo',
+        name: 'foo',
+      },
+      {
+        id: 'bar',
+        name: 'bar',
+      },
+    ]);
+  });
+
+  it('contains expected suggestions', () => {
+    expect(wrapper.prop('suggestions')).toEqual([
+      {
+        id: 'baz',
+        name: 'baz',
+      },
+    ]);
+  });
+
+  it('invokes onChange when new tags are added', () => {
+    wrapper.simulate('addition', { name: 'The-New-Tag' });
+
+    expect(onChange).toHaveBeenCalledWith([ ...tags, 'the-new-tag' ]);
+  });
+
+  it.each([
+    [ 0, 'bar' ],
+    [ 1, 'foo' ],
+  ])('invokes onChange when tags are deleted', (index, expected) => {
+    wrapper.simulate('delete', index);
+
+    expect(onChange).toHaveBeenCalledWith([ expected ]);
+  });
+});