diff --git a/tests/unit/.template.spec.js b/tests/unit/.template.js
similarity index 100%
rename from tests/unit/.template.spec.js
rename to tests/unit/.template.js
diff --git a/tests/unit/Breadcrumbs.spec.js b/tests/unit/base/Breadcrumbs.spec.js
similarity index 100%
rename from tests/unit/Breadcrumbs.spec.js
rename to tests/unit/base/Breadcrumbs.spec.js
diff --git a/tests/unit/Cards.spec.js b/tests/unit/base/Cards.spec.js
similarity index 100%
rename from tests/unit/Cards.spec.js
rename to tests/unit/base/Cards.spec.js
diff --git a/tests/unit/Carousels.spec.js b/tests/unit/base/Carousels.spec.js
similarity index 100%
rename from tests/unit/Carousels.spec.js
rename to tests/unit/base/Carousels.spec.js
diff --git a/tests/unit/Collapses.spec.js b/tests/unit/base/Collapses.spec.js
similarity index 100%
rename from tests/unit/Collapses.spec.js
rename to tests/unit/base/Collapses.spec.js
diff --git a/tests/unit/Forms.spec.js b/tests/unit/base/Forms.spec.js
similarity index 100%
rename from tests/unit/Forms.spec.js
rename to tests/unit/base/Forms.spec.js
diff --git a/tests/unit/Jumbotrons.spec.js b/tests/unit/base/Jumbotrons.spec.js
similarity index 100%
rename from tests/unit/Jumbotrons.spec.js
rename to tests/unit/base/Jumbotrons.spec.js
diff --git a/tests/unit/ListGroups.spec.js b/tests/unit/base/ListGroups.spec.js
similarity index 100%
rename from tests/unit/ListGroups.spec.js
rename to tests/unit/base/ListGroups.spec.js
diff --git a/tests/unit/Navbars.spec.js b/tests/unit/base/Navbars.spec.js
similarity index 100%
rename from tests/unit/Navbars.spec.js
rename to tests/unit/base/Navbars.spec.js
diff --git a/tests/unit/Navs.spec.js b/tests/unit/base/Navs.spec.js
similarity index 100%
rename from tests/unit/Navs.spec.js
rename to tests/unit/base/Navs.spec.js
diff --git a/tests/unit/Paginations.spec.js b/tests/unit/base/Paginations.spec.js
similarity index 100%
rename from tests/unit/Paginations.spec.js
rename to tests/unit/base/Paginations.spec.js
diff --git a/tests/unit/Popovers.spec.js b/tests/unit/base/Popovers.spec.js
similarity index 100%
rename from tests/unit/Popovers.spec.js
rename to tests/unit/base/Popovers.spec.js
diff --git a/tests/unit/ProgressBars.spec.js b/tests/unit/base/ProgressBars.spec.js
similarity index 100%
rename from tests/unit/ProgressBars.spec.js
rename to tests/unit/base/ProgressBars.spec.js
diff --git a/tests/unit/Switches.spec.js b/tests/unit/base/Switches.spec.js
similarity index 100%
rename from tests/unit/Switches.spec.js
rename to tests/unit/base/Switches.spec.js
diff --git a/tests/unit/Table.spec.js b/tests/unit/base/Table.spec.js
similarity index 100%
rename from tests/unit/Table.spec.js
rename to tests/unit/base/Table.spec.js
diff --git a/tests/unit/Tables.spec.js b/tests/unit/base/Tables.spec.js
similarity index 100%
rename from tests/unit/Tables.spec.js
rename to tests/unit/base/Tables.spec.js
diff --git a/tests/unit/Tabs.spec.js b/tests/unit/base/Tabs.spec.js
similarity index 100%
rename from tests/unit/Tabs.spec.js
rename to tests/unit/base/Tabs.spec.js
diff --git a/tests/unit/Tooltips.spec.js b/tests/unit/base/Tooltips.spec.js
similarity index 100%
rename from tests/unit/Tooltips.spec.js
rename to tests/unit/base/Tooltips.spec.js
diff --git a/tests/unit/BrandButtons.spec.js b/tests/unit/buttons/BrandButtons.spec.js
similarity index 100%
rename from tests/unit/BrandButtons.spec.js
rename to tests/unit/buttons/BrandButtons.spec.js
diff --git a/tests/unit/ButtonDropdowns.spec.js b/tests/unit/buttons/ButtonDropdowns.spec.js
similarity index 100%
rename from tests/unit/ButtonDropdowns.spec.js
rename to tests/unit/buttons/ButtonDropdowns.spec.js
diff --git a/tests/unit/ButtonGroups.spec.js b/tests/unit/buttons/ButtonGroups.spec.js
similarity index 100%
rename from tests/unit/ButtonGroups.spec.js
rename to tests/unit/buttons/ButtonGroups.spec.js
diff --git a/tests/unit/StandardButtons.spec.js b/tests/unit/buttons/StandardButtons.spec.js
similarity index 100%
rename from tests/unit/StandardButtons.spec.js
rename to tests/unit/buttons/StandardButtons.spec.js
diff --git a/tests/unit/DefaultAside.spec.js b/tests/unit/containers/DefaultAside.spec.js
similarity index 100%
rename from tests/unit/DefaultAside.spec.js
rename to tests/unit/containers/DefaultAside.spec.js
diff --git a/tests/unit/DefaultContainer.spec.js b/tests/unit/containers/DefaultContainer.spec.js
similarity index 100%
rename from tests/unit/DefaultContainer.spec.js
rename to tests/unit/containers/DefaultContainer.spec.js
diff --git a/tests/unit/DefaultHeaderDropdownAccnt.spec.js b/tests/unit/containers/DefaultHeaderDropdownAccnt.spec.js
similarity index 100%
rename from tests/unit/DefaultHeaderDropdownAccnt.spec.js
rename to tests/unit/containers/DefaultHeaderDropdownAccnt.spec.js
diff --git a/tests/unit/CoreUIIcons.spec.js b/tests/unit/icons/CoreUIIcons.spec.js
similarity index 100%
rename from tests/unit/CoreUIIcons.spec.js
rename to tests/unit/icons/CoreUIIcons.spec.js
diff --git a/tests/unit/Flags.spec.js b/tests/unit/icons/Flags.spec.js
similarity index 100%
rename from tests/unit/Flags.spec.js
rename to tests/unit/icons/Flags.spec.js
diff --git a/tests/unit/FontAwesome.spec.js b/tests/unit/icons/FontAwesome.spec.js
similarity index 100%
rename from tests/unit/FontAwesome.spec.js
rename to tests/unit/icons/FontAwesome.spec.js
diff --git a/tests/unit/SimpleLineIcons.spec.js b/tests/unit/icons/SimpleLineIcons.spec.js
similarity index 100%
rename from tests/unit/SimpleLineIcons.spec.js
rename to tests/unit/icons/SimpleLineIcons.spec.js
diff --git a/tests/unit/Alerts.spec.js b/tests/unit/notifications/Alerts.spec.js
similarity index 100%
rename from tests/unit/Alerts.spec.js
rename to tests/unit/notifications/Alerts.spec.js
diff --git a/tests/unit/Badges.spec.js b/tests/unit/notifications/Badges.spec.js
similarity index 100%
rename from tests/unit/Badges.spec.js
rename to tests/unit/notifications/Badges.spec.js
diff --git a/tests/unit/Modals.spec.js b/tests/unit/notifications/Modals.spec.js
similarity index 100%
rename from tests/unit/Modals.spec.js
rename to tests/unit/notifications/Modals.spec.js
diff --git a/tests/unit/Login.spec.js b/tests/unit/pages/Login.spec.js
similarity index 100%
rename from tests/unit/Login.spec.js
rename to tests/unit/pages/Login.spec.js
diff --git a/tests/unit/Page404.spec.js b/tests/unit/pages/Page404.spec.js
similarity index 100%
rename from tests/unit/Page404.spec.js
rename to tests/unit/pages/Page404.spec.js
diff --git a/tests/unit/Page500.spec.js b/tests/unit/pages/Page500.spec.js
similarity index 100%
rename from tests/unit/Page500.spec.js
rename to tests/unit/pages/Page500.spec.js
diff --git a/tests/unit/Register.spec.js b/tests/unit/pages/Register.spec.js
similarity index 100%
rename from tests/unit/Register.spec.js
rename to tests/unit/pages/Register.spec.js
diff --git a/tests/unit/theme/ColorTheme.spec.js b/tests/unit/theme/ColorTheme.spec.js
new file mode 100644
index 00000000..561cd883
--- /dev/null
+++ b/tests/unit/theme/ColorTheme.spec.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import { shallowMount, mount } from '@vue/test-utils'
+import BootstrapVue from 'bootstrap-vue'
+import Component from '@/views/theme/ColorTheme'
+
+Vue.use(BootstrapVue)
+const ComponentName = 'ColorTheme'
+
+describe(ComponentName + '.vue', () => {
+  it('has a name', () => {
+    expect(Component.name).toMatch(ComponentName)
+  })
+  it('is Vue instance', () => {
+    const wrapper = shallowMount(Component)
+    expect(wrapper.isVueInstance()).toBe(true)
+  })
+})
diff --git a/tests/unit/theme/ColorView.spec.js b/tests/unit/theme/ColorView.spec.js
new file mode 100644
index 00000000..9ddbe199
--- /dev/null
+++ b/tests/unit/theme/ColorView.spec.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import { shallowMount, mount } from '@vue/test-utils'
+import BootstrapVue from 'bootstrap-vue'
+import Component from '@/views/theme/ColorView'
+
+Vue.use(BootstrapVue)
+const ComponentName = 'ColorView'
+
+describe(ComponentName + '.vue', () => {
+  it('has a name', () => {
+    expect(Component.name).toMatch(ComponentName)
+  })
+  it('is Vue instance', () => {
+    const wrapper = shallowMount(Component)
+    expect(wrapper.isVueInstance()).toBe(true)
+  })
+})
diff --git a/tests/unit/Colors.spec.js b/tests/unit/theme/Colors.spec.js
similarity index 100%
rename from tests/unit/Colors.spec.js
rename to tests/unit/theme/Colors.spec.js
diff --git a/tests/unit/Typography.spec.js b/tests/unit/theme/Typography.spec.js
similarity index 100%
rename from tests/unit/Typography.spec.js
rename to tests/unit/theme/Typography.spec.js
diff --git a/tests/unit/User.spec.js b/tests/unit/users/User.spec.js
similarity index 100%
rename from tests/unit/User.spec.js
rename to tests/unit/users/User.spec.js
diff --git a/tests/unit/Users.spec.js b/tests/unit/users/Users.spec.js
similarity index 100%
rename from tests/unit/Users.spec.js
rename to tests/unit/users/Users.spec.js
diff --git a/tests/unit/widgets/Widget06.spec.js b/tests/unit/widgets/Widget06.spec.js
index 2d2374ab..52d6b03a 100644
--- a/tests/unit/widgets/Widget06.spec.js
+++ b/tests/unit/widgets/Widget06.spec.js
@@ -19,7 +19,5 @@ describe(ComponentName + '.vue', () => {
     expect(wrapper.props().cardClasses).toBe('')
     expect(wrapper.props().header).toBe('header:string')
     expect(wrapper.props().text).toBe('text:string')
-    expect(wrapper.props().chartType).toBe('chart1')
-    expect(wrapper.props().chartHeight == 70).toBe(true)
   })
 })
diff --git a/tests/unit/widgets/Widget07.spec.js b/tests/unit/widgets/Widget07.spec.js
new file mode 100644
index 00000000..d430d0c6
--- /dev/null
+++ b/tests/unit/widgets/Widget07.spec.js
@@ -0,0 +1,18 @@
+import Vue from 'vue'
+import { shallowMount } from '@vue/test-utils'
+import BootstrapVue from 'bootstrap-vue'
+import Component from '@/views/widgets/Widget07'
+
+Vue.use(BootstrapVue)
+
+const ComponentName = 'Widget07'
+const wrapper = shallowMount(Component)
+
+describe(ComponentName + '.vue', () => {
+  it('has a name', () => {
+    expect(Component.name).toMatch(ComponentName)
+  })
+  it('is Vue instance', () => {
+    expect(wrapper.isVueInstance()).toBe(true)
+  })
+})
diff --git a/tests/unit/widgets/Widget08.spec.js b/tests/unit/widgets/Widget08.spec.js
new file mode 100644
index 00000000..4796706a
--- /dev/null
+++ b/tests/unit/widgets/Widget08.spec.js
@@ -0,0 +1,18 @@
+import Vue from 'vue'
+import { shallowMount } from '@vue/test-utils'
+import BootstrapVue from 'bootstrap-vue'
+import Component from '@/views/widgets/Widget08'
+
+Vue.use(BootstrapVue)
+
+const ComponentName = 'Widget08'
+const wrapper = shallowMount(Component)
+
+describe(ComponentName + '.vue', () => {
+  it('has a name', () => {
+    expect(Component.name).toMatch(ComponentName)
+  })
+  it('is Vue instance', () => {
+    expect(wrapper.isVueInstance()).toBe(true)
+  })
+})