diff --git a/Use-Case-Tests.md b/Use-Case-Tests.md
index b815431..97b9e00 100644
--- a/Use-Case-Tests.md
+++ b/Use-Case-Tests.md
@@ -1,12 +1,10 @@
 _NB! Notation info: ... in the extension test cases means that the steps up to this point are same as in the main success scenario test case._
 # **Test Case #1**  
 **Use Case being tested:**    
-Use Case #5  
-**Use Case description:**  
-Displaying the public information of the ID card in the authentication application  
+[Use Case #5](https://github.com/TanelOrumaa/Estonian-ID-card-mobile-authenticator-POC/wiki/Use-Cases#use-case-5)  : Displaying the public information of the ID card in the authentication application  
 **Inputs:**  
 A valid Estonian ID card with a NFC interface  
-The CAN (Card Authentication Number) of the the ID card  
+The CAN (Card Authentication Number) of the ID card  
 **Initial system state:**  
 The application’s home screen is opened.  
 The NFC connection is enabled on the smartphone and the system has permission to use it.  
@@ -51,3 +49,66 @@ _Currently not working! More details in release notes._
     The connection between the ID card and smart card was lost.  
     The system notifies the user that connection to the ID card was lost.  
     The user is returned to the application’s home screen.
+
+# **Test Case #2**  
+**Use Case being tested:**    
+[Use Case #4](https://github.com/TanelOrumaa/Estonian-ID-card-mobile-authenticator-POC/wiki/Use-Cases#use-case-4)  : Saving the CAN of the ID card on the phone  
+**Inputs:**  
+The CAN (Card Authentication Number) of an ID card  
+**Initial system state:**  
+The application’s home screen is opened.  
+___
+**Main success scenario test:**  
+1. The user opens the app's settings and chooses to save the CAN of the ID card.  
+2. The user enters the valid CAN.  
+
+**Expected results:**  
+    The system notifies the user that the CAN has been saved.  
+    The CAN is saved and displayed to the user.  
+___
+**Extension test cases**  
+**Invalid CAN entered test:**
+1. ...  
+2. The user enters an invalid CAN (for example 000000).  
+
+**Expected results:**  
+    The system notifies the user that the CAN was invalid.  
+    The user is returned to the application’s home screen.  
+
+# **Test Case #3**  
+**Use Case being tested:**    
+[Use Case #6](https://github.com/TanelOrumaa/Estonian-ID-card-mobile-authenticator-POC/wiki/Use-Cases#use-case-6)  : Using biometric authentication to enter PIN 1 during the authentication process  
+**Inputs:**  
+A fine finger  
+**Initial system state:**  
+The user has enabled biometric authentication in the application’s settings.  
+The user has saved a valid PIN 1 to the biometric authentication method.  
+?The application has launched to authenticate the user and the user is shown a biometric authentication dialog.  
+___
+**Main success scenario test:**  
+1. The user touches a fingerprint sensor on the device.  
+
+**Expected results:**  
+    The fingerprint is detected and the application enters PIN 1 for the user automatically.  
+___
+**Extension test cases**  
+**Device's biometric authentication functionality is inaccessible test:**   
+
+**Expected results:**  
+    The system notifies the user that biometric authentication is currently unavailable.  
+    The user is asked to enter PIN 1 manually.  
+___
+**Invalid fingerprint test:**
+1. ...  
+
+**Expected results:**  
+    The system notifies the user that biometric authentication has failed due to a non-matching fingerprint.  
+    The user is asked to enter PIN 1 manually.  
+___
+**Invalid PIN 1 test:**
+1. ...  
+
+**Expected results:**  
+    The system notifies the user that biometric authentication has failed, because the saved PIN 1 is invalid.  
+    The authentication process is cancelled.  
+    Biometric authentication mode is automatically turned off by the application in the settings until a new PIN 1 is saved to this feature in order to avoid future use of this feature with an invalid PIN 1.