diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e462c4b..9a1482f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,8 +16,15 @@ jobs:
         uses: actions/checkout@v4
 
       # Task 1.1:
+      - name: Installation
+        run: yarn install
+      
+      - name: Run tests
+        run: yarn test
 
   deploy-infrastructure:
+    needs: 
+      - frontend-tests
     name: Deploy infrastructure with Terraform
     runs-on: ubuntu-latest
     # Task 1.2:
diff --git a/terraform/main.tf b/terraform/main.tf
index 71ba965..c461b78 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -9,7 +9,9 @@ resource "azurerm_resource_group" "devops" {
 
 resource "azurerm_static_web_app" "devops" {
   name                = "${var.my_name}-webapp"
-  # Task 2.2:
+  resource_group_name = azurerm_resource_group.devops.name
+  location            = local.location
+    # Task 2.2:
 }
 
 output "resource_group_name" {
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..fb57ccd
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+