diff --git a/tests/ChallengeFile/01_Set-ChallengeFile.Tests.ps1 b/tests/ChallengeFile/01_Set-ChallengeFile.Tests.ps1
new file mode 100644
index 0000000..762df84
--- /dev/null
+++ b/tests/ChallengeFile/01_Set-ChallengeFile.Tests.ps1
@@ -0,0 +1,34 @@
+#region HEADER
+$RepoRoot = (Get-GitDirectory).replace('\.git', '')
+$sut = (Split-Path -Leaf $MyInvocation.MyCommand.Path) -replace '\.Tests\.', '.'
+$sut = $sut -replace "\d{2}`_", ''
+$suthome = (Get-ChildItem -Path $RepoRoot -Exclude ".\tests\" -Filter $sut -Recurse).FullName
+# Skip try loading the source file if it doesn't exists.
+If ($suthome.Length -gt 0) {
+    . $suthome
+}
+Else {
+    Write-Warning ("Could not find source file {0}" -f $sut)
+}
+
+# load additional functions defined in the repository. Replace the expression <FunctionName>.
+. (Get-ChildItem -Path $RepoRoot -Filter "Get-RandomKey.ps1" -Recurse).FullName
+
+#endregion HEADER
+
+Describe "Set-ChallengeFile" {
+    Context "Tests with custom path" {
+        It "Working dir and path not exist" {
+            Set-ChallengeFile -Path 'C:\CredentialStore\Challenge.bin' | Should -Not -Throw
+        }
+        It "No parameter and non file should return true" {
+            if (Test-Path -Path ("{0}\PSCredentialStore\Challenge.bin" -f $env:ProgramData)) {
+                Remove-Item -Path ("{0}\PSCredentialStore\Challenge.bin" -f $env:ProgramData)
+            }
+            Set-ChallengeFile | Should -Be $true
+        }
+        It "Existing Credential file should return error" {
+            { Set-ChallengeFile } | Should -Throw
+        }
+    }
+}
diff --git a/tests/ChallengeFile/01_Test-ChallengeFile.Tests.ps1 b/tests/ChallengeFile/01_Test-ChallengeFile.Tests.ps1
index ca61842..285fddc 100644
--- a/tests/ChallengeFile/01_Test-ChallengeFile.Tests.ps1
+++ b/tests/ChallengeFile/01_Test-ChallengeFile.Tests.ps1
@@ -12,7 +12,7 @@ Else {
 }
 
 # load additional functions defined in the repository. Replace the expression <FunctionName>.
-. (Get-ChildItem -Path $RepoRoot -Filter "Test-ChallengeFile.ps1" -Recurse).FullName
+#. (Get-ChildItem -Path $RepoRoot -Filter "Test-ChallengeFile.ps1" -Recurse).FullName
 
 #endregion HEADER