diff --git a/package.json b/package.json
index 0cf1f6f762..3d58fb272e 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,8 @@
     ],
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
-      "^Components/(.*)$": "<rootDir>/src/components/$1"
+      "^Components/(.*)$": "<rootDir>/src/components/$1",
+      "^.+\\.(css|less)$": "<rootDir>/tests/javascript/helpers/CSSStub.js"
     },
     "testEnvironment": "jsdom",
     "transform": {
diff --git a/src/components/AddFeed.vue b/src/components/AddFeed.vue
index af5d759374..6e0aac0a86 100644
--- a/src/components/AddFeed.vue
+++ b/src/components/AddFeed.vue
@@ -1,87 +1,82 @@
 <template>
 	<NcModal @close="$emit('close')">
-		<div id="new-feed" news-add-feed="Navigation.feed">
-			<form ng-submit="Navigation.createFeed(Navigation.feed)"
-				ng-init="Navigation.feed.autoDiscover=true"
-				name="feedform">
-				<fieldset ng-disabled="Navigation.addingFeed" style="padding: 16px">
-					<input type="text"
-						:value="feed"
-						ng-model="Navigation.feed.url"
-						ng-class="{'ng-invalid':
-												!Navigation.addingFeed &&
-												Navigation.feedUrlExists(Navigation.feed.url)
-											}"
+		<div id="new-feed">
+			<form name="feedform">
+				<fieldset style="padding: 16px">
+					<input v-model="feedUrl"
+						type="text"
 						:placeholder="t('news', 'Web address')"
+						:class="{ 'invalid': feedUrlExists() }"
 						name="address"
 						pattern="[^\s]+"
 						required
-						autofocus>
+						autofocus
+						style="width: 90%;">
 
-					<p class="error"
-						ng-show="!Navigation.addingFeed &&
-											Navigation.feedUrlExists(Navigation.feed.url)">
+					<p v-if="feedUrlExists()" class="error">
 						{{ t("news", "Feed exists already!") }}
 					</p>
 
 					<!-- select a folder -->
-					<NcCheckboxRadioSwitch :checked.sync="createNewFolder" type="switch">
-						{{ t("news", "New folder") }}?
-					</NcCheckboxRadioSwitch>
-
-					<NcMultiselect v-if="!createNewFolder && folders"
-						v-model="folder"
-						:options="folders"
-						track-by="id"
-						label="name" />
+					<div style="display:flex;">
+						<NcSelect v-if="!createNewFolder && folders"
+							v-model="folder"
+							:options="folders"
+							:placeholder="'-- ' + t('news', 'No folder') + ' --'"
+							track-by="id"
+							label="name"
+							style="flex-grow: 1;" />
+
+						<!-- add a folder -->
+						<input v-if="createNewFolder"
+							v-model="newFolderName"
+							type="text"
+							:class="{ 'invalid': folderNameExists() }"
+							:placeholder="t('news', 'Folder name')"
+							name="folderName"
+							style="flex-grow: 1; padding: 22px 12px; margin: 0px;"
+							required>
+
+						<NcCheckboxRadioSwitch :checked.sync="createNewFolder" type="switch">
+							{{ t("news", "New folder") }}?
+						</NcCheckboxRadioSwitch>
+					</div>
 
-					<!-- add a folder -->
-					<input v-if="createNewFolder"
-						type="text"
-						ng-model="Navigation.feed.newFolder"
-						ng-class="{'ng-invalid':
-														!Navigation.addingFeed &&
-														!Navigation.addingFeed &&
-														Navigation.showNewFolder &&
-														Navigation.folderNameExists(Navigation.feed.newFolder)
-											}"
-						:placeholder="t('news', 'Folder name')"
-						name="folderName"
-						style="width: 90%"
-						required>
-
-					<p class="error"
-						ng-show="!Navigation.addingFeed &&
-											Navigation.folderNameExists(Navigation.feed.newFolder)">
+					<p v-if="folderNameExists()"
+						class="error">
 						{{ t("news", "Folder exists already!") }}
 					</p>
 
 					<!-- basic auth -->
+					<p v-if="withBasicAuth" class="warning">
+						{{
+							t(
+								"news",
+								"HTTP Basic Auth credentials must be stored unencrypted! Everyone with access to the server or database will be able to access them!"
+							)
+						}}
+					</p>
 
-					<NcCheckboxRadioSwitch :checked.sync="withBasicAuth" type="switch">
-						{{ t("news", "Credentials") }}?
-					</NcCheckboxRadioSwitch>
-
-					<div v-if="withBasicAuth" class="add-feed-basicauth">
-						<p class="warning">
-							{{
-								t(
-									"news",
-									"HTTP Basic Auth credentials must be stored unencrypted! Everyone with access to the server or database will be able to access them!"
-								)
-							}}
-						</p>
-						<input type="text"
-							ng-model="Navigation.feed.user"
-							:placeholder="t('news', 'Username')"
-							name="user"
-							autofocus>
-
-						<input type="password"
-							ng-model="Navigation.feed.password"
-							:placeholder="t('news', 'Password')"
-							name="password"
-							autocomplete="new-password">
+					<div style="display: flex">
+						<NcCheckboxRadioSwitch :checked.sync="withBasicAuth" type="switch" style="flex-grow: 1;">
+							{{ t("news", "Credentials") }}?
+						</NcCheckboxRadioSwitch>
+
+						<div v-if="withBasicAuth" class="add-feed-basicauth" style="flex-grow: 1;  display: flex;">
+							<input v-model="feedUser"
+								type="text"
+								:placeholder="t('news', 'Username')"
+								name="user"
+								autofocus
+								style="flex-grow: 1">
+
+							<input v-model="feedPassword"
+								type="password"
+								:placeholder="t('news', 'Password')"
+								name="password"
+								autocomplete="new-password"
+								style="flex-grow: 1">
+						</div>
 					</div>
 
 					<NcCheckboxRadioSwitch :checked.sync="autoDiscover" type="switch">
@@ -90,11 +85,7 @@
 
 					<NcButton :wide="true"
 						type="primary"
-						ng-disabled="Navigation.feedUrlExists(Navigation.feed.url) ||
-													(
-														Navigation.showNewFolder &&
-														Navigation.folderNameExists(folder.name)
-													)"
+						:disabled="disableAddFeed"
 						@click="addFeed()">
 						{{ t("news", "Subscribe") }}
 					</NcButton>
@@ -111,20 +102,22 @@ import Vue from 'vue'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
 import { Folder } from '../types/Folder'
-import { Feed } from '../types/Feed'
 import { ACTIONS } from '../store'
 
 type AddFeedState = {
-	folder: Folder;
+	folder?: Folder;
+	newFolderName: string;
+
 	autoDiscover: boolean;
 	createNewFolder: boolean;
 	withBasicAuth: boolean;
 
-	// from props
-	feed?: Feed;
+	feedUrl?: string;
+	feedUser?: string;
+	feedPassword?: string;
 };
 
 export default Vue.extend({
@@ -132,42 +125,73 @@ export default Vue.extend({
 		NcModal,
 		NcCheckboxRadioSwitch,
 		NcButton,
-		NcMultiselect,
-	},
-	props: {
-		feed: {
-			type: String,
-			default: '',
-		},
+		NcSelect,
 	},
 	data: (): AddFeedState => {
 		return {
-			folder: { name: '' } as Folder,
+			folder: undefined,
+			newFolderName: '',
+
 			autoDiscover: true,
 			createNewFolder: false,
 			withBasicAuth: false,
+
+			feedUrl: '',
+			feedUser: '',
+			feedPassword: '',
 		}
 	},
 	computed: {
 		folders(): Folder[] {
-			return this.$store.state.folders
+			return this.$store.state.folders.folders
+		},
+		disableAddFeed(): boolean {
+			return (this.feedUrl === ''
+						|| this.feedUrlExists()
+						|| (this.createNewFolder && (this.newFolderName === '' || this.folderNameExists())))
 		},
 	},
 	methods: {
-		newFolder() {
-			this.createNewFolder = true
-		},
-		abortNewFolder() {
-			this.createNewFolder = false
-		},
-		addFeed() {
+		/**
+		 * Adds a New Feed via the Vuex Store
+		 */
+		async addFeed() {
 			this.$store.dispatch(ACTIONS.ADD_FEED, {
 				feedReq: {
-					url: this.feed,
-					folder: this.folder,
-					autoDiscover: true,
+					url: this.feedUrl,
+					folder: this.createNewFolder ? { name: this.newFolderName } : this.folder,
+					autoDiscover: this.autoDiscover,
+					user: this.feedUser === '' ? undefined : this.feedUser,
+					password: this.feedPassword === '' ? undefined : this.feedPassword,
 				},
 			})
+
+			this.$emit('close')
+		},
+		/**
+		 * Checks if Feed Url exists in Vuex Store Feeds
+		 */
+		feedUrlExists(): boolean {
+			for (const feed of this.$store.state.feeds.feeds) {
+				if (feed.url === this.feedUrl) {
+					return true
+				}
+			}
+
+			return false
+		},
+		/**
+		 * Check if Folder Name exists in Vuex Store Folders
+		 */
+		folderNameExists(): boolean {
+			if (this.createNewFolder) {
+				for (const folder of this.$store.state.folders.folders) {
+					if (folder.name === this.newFolderName) {
+						return true
+					}
+				}
+			}
+			return false
 		},
 	},
 })
@@ -175,11 +199,7 @@ export default Vue.extend({
 </script>
 
 <style scoped>
-input {
-    width: 100%
-}
-
-.multiselect {
-    width: 100%
+.invalid {
+	border: 1px solid rgb(251, 72, 72) !important;
 }
 </style>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 7e88d97ffd..5ef486d858 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -34,9 +34,9 @@
 			</NcAppNavigationItem>
 
 			<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
-				:key="topLevelItem.name"
-				:title="topLevelItem.name"
-				icon="icon-folder"
+				:key="topLevelItem.name || topLevelItem.title"
+				:title="topLevelItem.name || topLevelItem.title"
+				:icon="topLevelItem.name !== undefined ? 'icon-folder': ''"
 				:allow-collapse="true">
 				<template #default>
 					<NcAppNavigationItem v-for="feed in topLevelItem.feeds"
@@ -101,7 +101,7 @@
 					</NcAppNavigationItem>
 				</template>
 				<template v-if="topLevelItem.feedCount > 0" #counter>
-					<CounterBubble>{{ topLevelItem.feedCount }}</CounterBubble>
+					<NcCounterBubble>{{ topLevelItem.feedCount }}</NcCounterBubble>
 				</template>
 				<template #actions>
 					<NcActionButton icon="icon-checkmark" @click="alert('TODO: Mark read')">
diff --git a/src/store/feed.ts b/src/store/feed.ts
index fde3c1d28c..9a0da520b3 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -1,18 +1,15 @@
 import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
 
 import { ActionParams, AppState } from '../store'
 import { Feed } from '../types/Feed'
+import { API_ROUTES } from '../types/ApiRoutes'
+import { FOLDER_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../types/MutationTypes'
 
 export const FEED_ACTION_TYPES = {
 	ADD_FEED: 'ADD_FEED',
 	FETCH_FEEDS: 'FETCH_FEEDS',
 }
 
-export const FEED_MUTATION_TYPES = {
-	SET_FEEDS: 'SET_FEEDS',
-}
-
 const state = {
 	feeds: [],
 }
@@ -23,46 +20,62 @@ const getters = {
 	},
 }
 
-const feedUrl = generateUrl('/apps/news/feeds')
-
 export const actions = {
 	async [FEED_ACTION_TYPES.FETCH_FEEDS]({ commit }: ActionParams) {
-		const feeds = await axios.get(
-			generateUrl('/apps/news/feeds'),
-		)
+		const feeds = await axios.get(API_ROUTES.FEED)
 
 		commit(FEED_MUTATION_TYPES.SET_FEEDS, feeds.data.feeds)
 	},
-	async [FEED_ACTION_TYPES.ADD_FEED]({ commit }: ActionParams, { feedReq }: { feedReq: { url: string; folder?: { id: number } } }) {
+	async [FEED_ACTION_TYPES.ADD_FEED](
+		{ commit }: ActionParams,
+		{ feedReq }: {
+			feedReq: {
+				url: string;
+				folder?: { id: number; name?: string; },
+				user?: string;
+				password?: string;
+			}
+		},
+	) {
 		let url = feedReq.url.trim()
 		if (!url.startsWith('http')) {
 			url = 'https://' + url
 		}
 
-		/**
-      if (title !== undefined) {
-          title = title.trim();
-      }
-		 */
+		let folderId
+		if (feedReq.folder?.id === undefined && feedReq.folder?.name && feedReq.folder?.name !== '') {
+			const response = await axios.post(API_ROUTES.FOLDER, { folderName: feedReq.folder?.name })
+			folderId = response.data.folders[0].id
+			commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, response.data.folders)
+		} else {
+			folderId = feedReq.folder?.id || 0
+		}
 
 		const feed: Feed = {
 			url,
-			folderId: feedReq.folder?.id || 0,
-			title: undefined,
+			folderId,
+			title: undefined, // TODO: let user define feed title on create?
 			unreadCount: 0,
 			autoDiscover: undefined, // TODO: autodiscover?
 		}
 
-		await axios.post(feedUrl, {
-			url: feed.url,
-			parentFolderId: feed.folderId,
-			title: null,
-			user: null,
-			password: null,
-			fullDiscover: feed.autoDiscover,
-		})
+		// Check that url is resolvable
+		try {
+			const response = await axios.post(API_ROUTES.FEED, {
+				url: feed.url,
+				parentFolderId: feed.folderId,
+				title: null,
+				user: feedReq.user ? feedReq.user : null,
+				password: feedReq.password ? feedReq.password : null,
+				fullDiscover: feed.autoDiscover,
+			})
+
+			commit(FEED_MUTATION_TYPES.ADD_FEED, response.data.feeds[0])
+		} catch (e) {
+			// TODO: show error to user if failure
+			console.log(e)
 
-		commit('addFeed', feed)
+		}
 	},
 }
 
@@ -70,13 +83,11 @@ export const mutations = {
 	[FEED_MUTATION_TYPES.SET_FEEDS](state: AppState, feeds: Feed[]) {
 		feeds.forEach(it => {
 			state.feeds.push(it)
-			const folder = state.folders.find(folder => folder.id === it.folderId)
-			if (folder) {
-				folder.feeds.push(it)
-				folder.feedCount += it.unreadCount
-			}
 		})
 	},
+	[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
+		state.feeds.push(feed)
+	},
 }
 
 export default {
diff --git a/src/store/folder.ts b/src/store/folder.ts
index 8787101af3..b1ae2e59d0 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -1,8 +1,10 @@
 import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
 
 import { AppState, ActionParams } from '../store'
 import { Folder } from '../types/Folder'
+import { Feed } from '../types/Feed'
+import { FOLDER_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../types/MutationTypes'
+import { API_ROUTES } from '../types/ApiRoutes'
 
 export const FOLDER_ACTION_TYPES = {
 	FETCH_FOLDERS: 'FETCH_FOLDERS',
@@ -10,11 +12,6 @@ export const FOLDER_ACTION_TYPES = {
 	DELETE_FOLDER: 'DELETE_FOLDER',
 }
 
-export const FOLDER_MUTATION_TYPES = {
-	SET_FOLDERS: 'SET_FOLDERS',
-	DELETE_FOLDER: 'DELETE_FOLDER',
-}
-
 const state = {
 	folders: [],
 }
@@ -25,18 +22,14 @@ const getters = {
 	},
 }
 
-const folderUrl = generateUrl('/apps/news/folders')
-
 export const actions = {
 	async [FOLDER_ACTION_TYPES.FETCH_FOLDERS]({ commit }: ActionParams) {
-		const folders = await axios.get(
-			generateUrl('/apps/news/folders'),
-		)
+		const folders = await axios.get(API_ROUTES.FOLDER)
 
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, folders.data.folders)
 	},
 	async [FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit }: ActionParams, { folder }: { folder: Folder}) {
-		const response = await axios.post(folderUrl, { folderName: folder.name })
+		const response = await axios.post(API_ROUTES.FOLDER, { folderName: folder.name })
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, response.data.folders)
 	},
 	async [FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit }: ActionParams, { folder }: { folder: Folder}) {
@@ -46,7 +39,7 @@ export const actions = {
           promises.push(self.reversiblyDelete(feed.id, false, true));
       });
 		 */
-		await axios.delete(folderUrl + '/' + folder.id)
+		await axios.delete(API_ROUTES.FOLDER + '/' + folder.id)
 		commit(FOLDER_MUTATION_TYPES.DELETE_FOLDER, folder)
 	},
 }
@@ -63,6 +56,22 @@ export const mutations = {
 		const index = state.folders.indexOf(folder)
 		state.folders.splice(index, 1)
 	},
+	[FEED_MUTATION_TYPES.SET_FEEDS](state: AppState, feeds: Feed[]) {
+		feeds.forEach(it => {
+			const folder = state.folders.find(folder => folder.id === it.folderId)
+			if (folder) {
+				folder.feeds.push(it)
+				folder.feedCount += it.unreadCount
+			}
+		})
+	},
+	[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
+		const folder = state.folders.find(folder => folder.id === feed.folderId)
+		if (folder) {
+			folder.feeds.push(feed)
+			folder.feedCount += feed.unreadCount
+		}
+	},
 }
 
 export default {
diff --git a/src/store/index.ts b/src/store/index.ts
index 1a6dfc1c9f..539a1b2dea 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -1,7 +1,8 @@
 import { Folder } from '../types/Folder'
 import { Feed } from '../types/Feed'
-import feeds, { FEED_MUTATION_TYPES, FEED_ACTION_TYPES } from './feed'
-import folders, { FOLDER_MUTATION_TYPES, FOLDER_ACTION_TYPES } from './folder'
+import feeds, { FEED_ACTION_TYPES } from './feed'
+import folders, { FOLDER_ACTION_TYPES } from './folder'
+import { FOLDER_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../types/MutationTypes'
 
 export const MUTATIONS = {
 	...FEED_MUTATION_TYPES,
diff --git a/src/types/ApiRoutes.ts b/src/types/ApiRoutes.ts
new file mode 100644
index 0000000000..c05a5f7166
--- /dev/null
+++ b/src/types/ApiRoutes.ts
@@ -0,0 +1,6 @@
+import { generateUrl } from '@nextcloud/router'
+
+export const API_ROUTES = {
+	FOLDER: generateUrl('/apps/news/folders'),
+	FEED: generateUrl('/apps/news/feeds'),
+}
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
new file mode 100644
index 0000000000..294deaffdb
--- /dev/null
+++ b/src/types/MutationTypes.ts
@@ -0,0 +1,9 @@
+export const FEED_MUTATION_TYPES = {
+	ADD_FEED: 'ADD_FEED',
+	SET_FEEDS: 'SET_FEEDS',
+}
+
+export const FOLDER_MUTATION_TYPES = {
+	SET_FOLDERS: 'SET_FOLDERS',
+	DELETE_FOLDER: 'DELETE_FOLDER',
+}
diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php
index a80afeb135..3e47c6136d 100644
--- a/tests/Unit/Service/FolderServiceTest.php
+++ b/tests/Unit/Service/FolderServiceTest.php
@@ -66,8 +66,9 @@ protected function setUp(): void
     {
         $this->time = 222;
 
-        $timeFactoryBuilder = $this->getMockBuilder(TimeFactory::class)
-            ->disableOriginalConstructor();
+        $timeFactory = $this->getMockBuilder(TimeFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $mockDateTime = $this->getMockBuilder(\DateTimeImmutable::class)
             ->disableOriginalConstructor()
diff --git a/tests/javascript/helpers/CSSStub.js b/tests/javascript/helpers/CSSStub.js
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/javascript/unit/components/AddFeed.spec.ts b/tests/javascript/unit/components/AddFeed.spec.ts
index 66105e3f8a..ce1a9581d2 100644
--- a/tests/javascript/unit/components/AddFeed.spec.ts
+++ b/tests/javascript/unit/components/AddFeed.spec.ts
@@ -1,23 +1,86 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils'
-
 import AddFeed from '../../../../src/components/AddFeed.vue'
+import { FEED_ACTION_TYPES } from '@/store/feed'
 
 describe('AddFeed.vue', () => {
 	'use strict'
 
-	it('should initialize without showing createNewFolder', () => {
+	let mockDispatch = jest.fn();
+	let mockStore = {
+		state: {
+			folders: { folders: [] },
+			feeds: { feeds: [] }
+		},
+		dispatch: mockDispatch
+	}
+
+	let wrapper: any
+	beforeEach(() => {
 		const localVue = createLocalVue()
-		const wrapper = shallowMount(AddFeed, {
+		wrapper = shallowMount(AddFeed, {
 			localVue,
 			mocks: {
-				$store: {
-					state: {
-						folders: [],
-					},
-				},
+				$store: mockStore,
 			},
 		})
+	})
 
+	it('should initialize with default values', () => {
 		expect(wrapper.vm.$data.createNewFolder).toBeFalsy()
+		expect(wrapper.vm.$data.autoDiscover).toBeTruthy()
+		expect(wrapper.vm.$data.withBasicAuth).toBeFalsy()
+	})
+
+	it('should dispatch ADD_FEED action to store', async () => {
+		wrapper.vm.$emit = jest.fn()
+
+		await wrapper.vm.addFeed()
+
+		expect(wrapper.vm.$emit).toBeCalled()
+		expect(mockDispatch).toBeCalled()
+		expect(mockDispatch.mock.calls[0][0]).toEqual(FEED_ACTION_TYPES.ADD_FEED);
+	})
+
+	it('should check if feed url exists and return true', () => {
+		wrapper.vm.$data.feedUrl = ''
+		let response = wrapper.vm.feedUrlExists()
+
+		expect(response).toBeFalsy()
+
+		wrapper.vm.$data.feedUrl = 'http://test.com'
+		response = wrapper.vm.feedUrlExists()
+
+		expect(response).toBeFalsy()
+
+		wrapper.vm.$data.feedUrl = 'http://test.com'
+		wrapper.vm.$store.state.feeds.feeds = [{ url: 'http://test.com'}]
+		response = wrapper.vm.feedUrlExists()
+
+		expect(response).toBeTruthy()
+	})
+
+	it('should check if folder name exists when creating folder and return true', () => {
+		wrapper.vm.$data.newFolderName = ''
+		let response = wrapper.vm.folderNameExists()
+
+		expect(response).toBeFalsy()
+
+		wrapper.vm.$data.newFolderName = 'test'
+		response = wrapper.vm.folderNameExists()
+
+		expect(response).toBeFalsy()
+
+		wrapper.vm.$data.newFolderName = 'test'
+		wrapper.vm.$store.state.folders.folders = [{ name: 'test'}]
+		response = wrapper.vm.folderNameExists()
+
+		expect(response).toBeFalsy()
+
+		wrapper.vm.$data.newFolderName = 'test'
+		wrapper.vm.$data.createNewFolder = 'test'
+		wrapper.vm.$store.state.folders.folders = [{ name: 'test'}]
+		response = wrapper.vm.folderNameExists()
+
+		expect(response).toBeTruthy()
 	})
 })
diff --git a/tests/javascript/unit/store/feed.spec.ts b/tests/javascript/unit/store/feed.spec.ts
index 29df4b1054..922c79f3fa 100644
--- a/tests/javascript/unit/store/feed.spec.ts
+++ b/tests/javascript/unit/store/feed.spec.ts
@@ -1,7 +1,9 @@
 import axios from '@nextcloud/axios'
 import { Feed } from '../../../../src/types/Feed'
 import { AppState } from '../../../../src/store'
-import { FEED_ACTION_TYPES, FEED_MUTATION_TYPES, mutations, actions } from '../../../../src/store/feed'
+import { FEED_ACTION_TYPES, mutations, actions } from '../../../../src/store/feed'
+
+import { FEED_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
 
 jest.mock('@nextcloud/axios')
 
@@ -9,12 +11,23 @@ describe('feed.ts', () => {
 	'use strict'
 
 	describe('actions', () => {
-		it('ADD_FEED should call POST and commit feed to state', async () => {
-			(axios as any).post.mockResolvedValue()
-			const commit = jest.fn()
-			await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit }, { feedReq: { url: '' } })
-			expect(axios.post).toBeCalled()
-			expect(commit).toBeCalled()
+		describe('ADD_FEED', () => {
+			it('should call POST and commit feed to state', async () => {
+				(axios as any).post.mockResolvedValue({ data: { feeds: [] } })
+				const commit = jest.fn()
+				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit }, { feedReq: { url: '' } })
+				expect(axios.post).toBeCalled()
+				expect(commit).toBeCalled()
+			})
+
+			it('should call POST and not call commit if error', async () => {
+				(axios as any).post.mockRejectedValue()
+				const commit = jest.fn()
+				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit }, { feedReq: { url: '' } })
+				expect(axios.post).toBeCalled()
+
+				expect(commit).not.toBeCalled()
+			})
 		})
 
 		it('FETCH_FEEDS should call GET and commit returned feeds to state', async () => {
@@ -27,29 +40,31 @@ describe('feed.ts', () => {
 	})
 
 	describe('mutations', () => {
-		it('SET_FEEDS should add feeds to state', () => {
-			const state = { feeds: [] as Feed[], folders: [] as any[] } as AppState
-			let feeds = [] as Feed[]
+		describe('SET_FEEDS', () => {
+			it('should add feeds to state', () => {
+				const state = { feeds: [] as Feed[], folders: [] as any[] } as AppState
+				let feeds = [] as any
 
-			mutations[FEED_MUTATION_TYPES.SET_FEEDS](state, feeds)
-			expect(state.feeds.length).toEqual(0)
+				mutations[FEED_MUTATION_TYPES.SET_FEEDS](state, feeds)
+				expect(state.feeds.length).toEqual(0)
 
-			feeds = [{ title: 'test' }] as Feed[]
+				feeds = [{ title: 'test' }] as Feed[]
 
-			mutations[FEED_MUTATION_TYPES.SET_FEEDS](state, feeds)
-			expect(state.feeds.length).toEqual(1)
-			expect(state.feeds[0]).toEqual(feeds[0])
+				mutations[FEED_MUTATION_TYPES.SET_FEEDS](state, feeds)
+				expect(state.feeds.length).toEqual(1)
+				expect(state.feeds[0]).toEqual(feeds[0])
+			})
 		})
 
-		it('SET_FEEDS should add feeds and unreadCount to folder if exists and folder set', () => {
-			const state = { feeds: [] as Feed[], folders: [{ id: 1, feedCount: 3, feeds: [] as Feed[] }] } as AppState
-			const feeds = [{ title: 'test', folderId: 1, unreadCount: 2 }] as Feed[]
+		describe('ADD_FEED', () => {
+			it('should add a single feed to state', () => {
+				const state = { feeds: [] as Feed[], folders: [] as any[] } as AppState
+				const feed = { title: 'test' } as any
 
-			mutations[FEED_MUTATION_TYPES.SET_FEEDS](state, feeds)
-			expect(state.feeds.length).toEqual(1)
-			expect(state.feeds[0]).toEqual(feeds[0])
-			expect(state.folders[0].feeds[0]).toEqual(feeds[0])
-			expect(state.folders[0].feedCount).toEqual(5)
+				mutations[FEED_MUTATION_TYPES.ADD_FEED](state, feed)
+				expect(state.feeds.length).toEqual(1)
+				expect(state.feeds[0]).toEqual(feed)
+			})
 		})
 	})
 })
diff --git a/tests/javascript/unit/store/folder.spec.ts b/tests/javascript/unit/store/folder.spec.ts
index 68cc04da7a..eacfd18cb4 100644
--- a/tests/javascript/unit/store/folder.spec.ts
+++ b/tests/javascript/unit/store/folder.spec.ts
@@ -2,7 +2,8 @@ import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { Folder } from '../../../../src/types/Folder'
 import { AppState } from '../../../../src/store'
-import { FOLDER_ACTION_TYPES, FOLDER_MUTATION_TYPES, mutations, actions } from '../../../../src/store/folder'
+import { FOLDER_ACTION_TYPES, mutations, actions } from '../../../../src/store/folder'
+import { FOLDER_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
 
 jest.mock('@nextcloud/axios')
 jest.mock('@nextcloud/router')