diff --git a/src/components/Tabs.vue b/src/components/Tabs.vue
index 4ae2d7f..7a7439a 100644
--- a/src/components/Tabs.vue
+++ b/src/components/Tabs.vue
@@ -1,14 +1,14 @@
 <template>
-   <div id="tabs-container">
-    <div id="tabs__header" v-if="tabs.length > 0">
+   <div id="tabs">
+    <div id="tabs-header" v-if="tabs.length > 0">
       <div
         v-for="(tab, index) in tabs"
         :key="index"
         @click="selectTab(tab.id)"
-        :class="[{'tab__selected': (tab.id === selectedIndex)}, 'tab']"
+        :class="[{'tab-selected': (tab.id === selectedIndex)}, 'tab']"
       >
         <div class="tab-name">
-          <span v-show="tab.isUnsaved">*</span>
+          <span v-show="tab.isUnsaved" class="star">*</span>
           <span v-if="tab.name">{{ tab.name }}</span>
           <span v-else class="tab-untitled">{{ tab.tempName }}</span>
         </div>
@@ -27,7 +27,7 @@
       :is-predefined="tab.isPredefined"
       :tab-index="index"
     />
-    <div v-if="tabs.length === 0" id="start-guide">
+    <div v-show="tabs.length === 0" id="start-guide">
       <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
       a new query from scratch or open the one from
       <router-link class="link" to="/my-queries">My queries</router-link>
@@ -128,18 +128,18 @@ export default {
 </script>
 
 <style>
-#tabs-container {
+#tabs {
   position: relative;
   height: 100%;
   background-color: var(--color-bg-light);
 }
-#tabs__header {
+#tabs-header {
   display: flex;
   margin: 0;
   max-width: 100%;
   overflow: hidden;
 }
-#tabs__header .tab {
+#tabs-header .tab {
   height: 36px;
   background-color: var(--color-bg-light);
   border-right: 1px solid var(--color-border-light);
@@ -155,24 +155,24 @@ export default {
   flex-shrink: 1;
   min-width: 0;
 }
-#tabs__header .tab-name {
+#tabs-header .tab-name {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   flex-shrink: 1;
 }
 
-#tabs__header div:hover {
+#tabs-header div:hover {
   cursor: pointer;
 }
 
-#tabs__header .tab__selected {
+#tabs-header .tab-selected {
   color: var(--color-text-active);
   font-weight: 600;
   border-bottom: none;
   background-color: var(--color-white);
 }
-#tabs__header .tab__selected:hover {
+#tabs-header .tab-selected:hover {
     cursor: default;
 }
 
diff --git a/tests/unit/checkBox.spec.js b/tests/unit/components/CheckBox.spec.js
similarity index 100%
rename from tests/unit/checkBox.spec.js
rename to tests/unit/components/CheckBox.spec.js
diff --git a/tests/unit/Schema.spec.js b/tests/unit/components/Schema.spec.js
similarity index 100%
rename from tests/unit/Schema.spec.js
rename to tests/unit/components/Schema.spec.js
diff --git a/tests/unit/TableDescription.spec.js b/tests/unit/components/TableDescription.spec.js
similarity index 87%
rename from tests/unit/TableDescription.spec.js
rename to tests/unit/components/TableDescription.spec.js
index 869afbb..cc71e82 100644
--- a/tests/unit/TableDescription.spec.js
+++ b/tests/unit/components/TableDescription.spec.js
@@ -1,10 +1,10 @@
 import { expect } from 'chai'
 import { shallowMount } from '@vue/test-utils'
-import tableDescription from '@/components/TableDescription.vue'
+import TableDescription from '@/components/TableDescription.vue'
 
 describe('TableDescription.vue', () => {
   it('Initially the columns are hidden and table name is rendered', () => {
-    const wrapper = shallowMount(tableDescription, {
+    const wrapper = shallowMount(TableDescription, {
       propsData: {
         name: 'Test table',
         columns: [
@@ -18,7 +18,7 @@ describe('TableDescription.vue', () => {
   })
 
   it('Columns are visible and correct when click on table name', async () => {
-    const wrapper = shallowMount(tableDescription, {
+    const wrapper = shallowMount(TableDescription, {
       propsData: {
         name: 'Test table',
         columns: [