diff --git a/README.md b/README.md
index e23a6d1..d1d5b16 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ It has only one function: generate the [Fibonacci sequence](https://en.wikipedia
 ## How do I build it?
 
 1. - [x] Clone this repository ot just [use it as template](https://github.com/asm0dey/dummylib-multiplatform/generate)
-1. - [ ] Edit project name in [`settings.gradle.kts`](settings.gradle.kts#L17)
+1. - [ ] Edit library module name and include it in [`settings.gradle.kts`](settings.gradle.kts#L18)
 1. - [ ] Edit [`groupId` and `version`](convention-plugins/src/main/kotlin/module.publication.gradle.kts#L10-L11)
     1. If you need the Android support update namespace [there](library/build.gradle.kts#L38) too
     1. If you don't need an Android support delete the [`android` section](library/build.gradle.kts#L37-L43)
diff --git a/build.gradle.kts b/build.gradle.kts
index b9ba347..544e7a8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("root.publication")
-    id("module.publication")
     //trick: for the same plugin versions in all sub-modules
     alias(libs.plugins.androidLibrary).apply(false)
     alias(libs.plugins.kotlinMultiplatform).apply(false)
diff --git a/convention-plugins/src/main/kotlin/module.publication.gradle.kts b/convention-plugins/src/main/kotlin/module.publication.gradle.kts
index a64ba92..6a216c4 100644
--- a/convention-plugins/src/main/kotlin/module.publication.gradle.kts
+++ b/convention-plugins/src/main/kotlin/module.publication.gradle.kts
@@ -7,9 +7,6 @@ plugins {
     signing
 }
 
-group = "com.github.asm0dey.dummylib"
-version = "0.0.1"
-
 publishing {
     // Configure all publications
     publications.withType<MavenPublication> {
@@ -19,7 +16,7 @@ publishing {
             archiveAppendix.set(this@withType.name)
         })
 
-        // Provide artifacts information requited by Maven Central
+        // Provide artifacts information required by Maven Central
         pom {
             name.set("Dummy Kotlin Multiplatform library")
             description.set("Dummy library to test deployment to Maven Central")
diff --git a/convention-plugins/src/main/kotlin/root.publication.gradle.kts b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
index b26b067..dc80eac 100644
--- a/convention-plugins/src/main/kotlin/root.publication.gradle.kts
+++ b/convention-plugins/src/main/kotlin/root.publication.gradle.kts
@@ -2,6 +2,11 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin")
 }
 
+allprojects {
+    group = "com.github.asm0dey.dummylib"
+    version = "0.0.1"
+}
+
 nexusPublishing {
     // Configure maven central repository
     // https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
diff --git a/gradle.properties b/gradle.properties
index a56e691..f60cfee 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 #Gradle
 org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.caching=true
+org.gradle.configuration-cache=true
 
 #Kotlin
 kotlin.code.style=official
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
index a76ce48..51d0fab 100644
--- a/library/build.gradle.kts
+++ b/library/build.gradle.kts
@@ -20,11 +20,17 @@ kotlin {
     iosSimulatorArm64()
     linuxX64()
 
-    sourceSets.commonMain.get().dependencies {
-        //put your multiplatform dependencies here
-    }
-    sourceSets.commonTest.get().dependencies {
-        implementation(libs.kotlin.test)
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                //put your multiplatform dependencies here
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(libs.kotlin.test)
+            }
+        }
     }
 }
 
diff --git a/library/src/androidUnitTest/kotlin/AndroidFibiTest.kt b/library/src/androidUnitTest/kotlin/AndroidFibiTest.kt
new file mode 100644
index 0000000..481af37
--- /dev/null
+++ b/library/src/androidUnitTest/kotlin/AndroidFibiTest.kt
@@ -0,0 +1,10 @@
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class AndroidFibiTest {
+
+    @Test
+    fun `test 3rd element`() {
+        assertEquals(3, fibi.take(3).last())
+    }
+}
\ No newline at end of file
diff --git a/library/src/androidUnitTest/kotlin/FibiTest.kt b/library/src/androidUnitTest/kotlin/FibiTest.kt
deleted file mode 100644
index 90e9a68..0000000
--- a/library/src/androidUnitTest/kotlin/FibiTest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class FibiTest {
-    @Test
-    fun `test 3rd element`(){
-       assertEquals(3, fibi.take(3).last())
-    }
-}
\ No newline at end of file
diff --git a/library/src/commonTest/kotlin/FibiTest.kt b/library/src/commonTest/kotlin/FibiTest.kt
new file mode 100644
index 0000000..1b0c5db
--- /dev/null
+++ b/library/src/commonTest/kotlin/FibiTest.kt
@@ -0,0 +1,10 @@
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class FibiTest {
+
+    @Test
+    fun `test 3rd element`() {
+        assertEquals(firstElement + secondElement, fibi.take(3).last())
+    }
+}
\ No newline at end of file
diff --git a/library/src/iosTest/kotlin/FibiTest.kt b/library/src/iosTest/kotlin/FibiTest.kt
deleted file mode 100644
index 69a1234..0000000
--- a/library/src/iosTest/kotlin/FibiTest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class FibiTest {
-    @Test
-    fun `test 3rd element`(){
-       assertEquals(7, fibi.take(3).last())
-    }
-}
\ No newline at end of file
diff --git a/library/src/iosTest/kotlin/IosFibiTest.kt b/library/src/iosTest/kotlin/IosFibiTest.kt
new file mode 100644
index 0000000..778d22a
--- /dev/null
+++ b/library/src/iosTest/kotlin/IosFibiTest.kt
@@ -0,0 +1,10 @@
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class IosFibiTest {
+
+    @Test
+    fun `test 3rd element`() {
+        assertEquals(7, fibi.take(3).last())
+    }
+}
\ No newline at end of file
diff --git a/library/src/jvmTest/kotlin/FibiTest.kt b/library/src/jvmTest/kotlin/FibiTest.kt
deleted file mode 100644
index 8c94f70..0000000
--- a/library/src/jvmTest/kotlin/FibiTest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class FibiTest {
-    @Test
-    fun `test 3rd element`(){
-       assertEquals(5, fibi.take(3).last())
-    }
-}
\ No newline at end of file
diff --git a/library/src/jvmTest/kotlin/JvmFibiTest.kt b/library/src/jvmTest/kotlin/JvmFibiTest.kt
new file mode 100644
index 0000000..09dedb1
--- /dev/null
+++ b/library/src/jvmTest/kotlin/JvmFibiTest.kt
@@ -0,0 +1,10 @@
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class JvmFibiTest {
+
+    @Test
+    fun `test 3rd element`() {
+        assertEquals(5, fibi.take(3).last())
+    }
+}
\ No newline at end of file
diff --git a/library/src/linuxX64Test/kotlin/FibiTest.kt b/library/src/linuxX64Test/kotlin/FibiTest.kt
deleted file mode 100644
index 44802b7..0000000
--- a/library/src/linuxX64Test/kotlin/FibiTest.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class FibiTest {
-    @Test
-    fun `test 3rd element`(){
-       assertEquals(8, fibi.take(3).last())
-    }
-}
diff --git a/library/src/linuxX64Test/kotlin/LinuxFibiTest.kt b/library/src/linuxX64Test/kotlin/LinuxFibiTest.kt
new file mode 100644
index 0000000..b08b96c
--- /dev/null
+++ b/library/src/linuxX64Test/kotlin/LinuxFibiTest.kt
@@ -0,0 +1,10 @@
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class LinuxFibiTest {
+
+    @Test
+    fun `test 3rd element`() {
+        assertEquals(8, fibi.take(3).last())
+    }
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 93be8b4..56f829e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,11 +1,7 @@
 pluginManagement {
     includeBuild("convention-plugins")
     repositories {
-        google {
-            mavenContent {
-                releasesOnly()
-            }
-        }
+        google()
         mavenCentral()
         gradlePluginPortal()
     }