diff --git a/.github/workflows/ios_test.yml b/.github/workflows/ios_test.yml
index 434d8a84..5fcd70fd 100644
--- a/.github/workflows/ios_test.yml
+++ b/.github/workflows/ios_test.yml
@@ -63,8 +63,11 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Generate KMM frameworks for Cocoapods
-        run: ./gradlew generateDummyFramework
-        working-directory: ./sample
+        run: |
+          pwd
+          cd ..
+          pwd
+          ./gradlew generateDummyFramework
 
       - name: Install Pods Dependencies
         run: bundle exec pod install
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index af2e0359..3e84f32d 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     kotlin(Plugins.ANDROID)
 }
 
-val keystoreProperties = loadProperties("signing.properties")
+val keystoreProperties = rootDir.loadGradleProperties("signing.properties")
 
 android {
     namespace = "co.nimblehq.kmm.template.android"
diff --git a/buildSrc/src/main/java/FileExt.kt b/buildSrc/src/main/java/FileExt.kt
new file mode 100644
index 00000000..e52f52d1
--- /dev/null
+++ b/buildSrc/src/main/java/FileExt.kt
@@ -0,0 +1,12 @@
+import java.io.File
+import java.util.*
+
+fun File.loadGradleProperties(fileName: String): Properties {
+    val properties = Properties()
+    val signingProperties = File(this, fileName)
+
+    if (signingProperties.isFile) {
+        properties.load(signingProperties.inputStream())
+    }
+    return properties
+}
diff --git a/make.sh b/make.sh
index 7b77557b..f3562307 100755
--- a/make.sh
+++ b/make.sh
@@ -110,5 +110,5 @@ rsync -av \
     --exclude '.git' \
     --exclude '.gitmodules' \
     --exclude 'make.sh' \
-    --exclude 'sample' \
+    --exclude './sample' \
     ./ sample/
diff --git a/make_ios.sh b/make_ios.sh
index 589024ce..4df1f31b 100644
--- a/make_ios.sh
+++ b/make_ios.sh
@@ -38,6 +38,8 @@ cd ios
 
 echo "=> Removing unnecessary files and folders"
 rm -rf {PROJECT_NAME}/sources/data
+rm -f {PROJECT_NAME}KIFUITests/Sources/Specs/Application/ApplicationSpec.swift
+rm -f {PROJECT_NAME}Tests/Sources/Specs/Supports/Extensions/Foundation/OptionalUnwrapSpec.swift
 
 # Because iOS-template is a submodule of the KKM-template, there is no .git directory.
 sed -i '' "/rm -f .git*/d" make.sh