diff --git a/README.md b/README.md
index 20878418..279429a6 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,13 @@ Access to the "prod" environment is facilitated through a DNS URL, thanks to Rou
 
     `ssh ubuntu@[instance-id] -i keypair.pem -o ProxyCommand='aws ec2-instance-connect open-tunnel --instance-id %h'`
 
-6.  Now XC3 will run at 05:00AM UTC every day to generate data and populate Grafana. Few lambdas (Total Account Cost and Project spend) will run twice in a month.
+6.  Go to AWS Systems Manager, select Parameter Store, and create a new parameter named "/{namespace}/region_names". Set the value as a dictionary with region IDs as keys and region names as values.
+
+7.  SSH into the private instance using EIC Endpoint to check if everything is working fine. Here replace [instance-id] needs to be replaced with ID
+
+    `ssh ubuntu@[instance-id] -i keypair.pem -o ProxyCommand='aws ec2-instance-connect open-tunnel --instance-id %h'`
+
+8.  Now XC3 will run at 05:00AM UTC every day to generate data and populate Grafana. Few lambdas (Total Account Cost and Project spend) will run twice in a month.
 
         Note :
             1. If data is not available in Grafana UI then follow the troubleshooting guide at the last section of this page.
@@ -172,6 +178,8 @@ case 1: If data is not showing into Grafana UI, there could be several reasons a
 
 3. XC3 Budget Detail/IAM Role/User Workflow lambda may have failed to execute , please check Cloudwatch logs to address the issue.
 
+4. Check if XC3's most expensive services data is missing, and if so, verify the existence of the corresponding SSM parameter in AWS Systems Manager. To address this issue, ensure you follow step 5 of the deployment instructions.
+
 case 2: user not able to change/update/modify default dashboards in Grafana UI
 
 1.  You can't change/update default dashboards.
diff --git a/User Manual Federated User.pdf b/User Manual Federated User.pdf
new file mode 100644
index 00000000..fac02f86
Binary files /dev/null and b/User Manual Federated User.pdf differ
diff --git a/custom_dashboard/dummy_local/data_push1.py b/custom_dashboard/dummy_local/data_push1.py
new file mode 100755
index 00000000..0c1efb4b
--- /dev/null
+++ b/custom_dashboard/dummy_local/data_push1.py
@@ -0,0 +1,50 @@
+import json
+from prometheus_client import CollectorRegistry, Gauge, push_to_gateway
+
+# Load the JSON data
+with open('dummy_data1.json', 'r') as file:
+    data1 = json.load(file)
+
+def push_to_prometheus(data1):
+    registry = CollectorRegistry()
+
+    # Create a single gauge with multiple labels
+    gauge = Gauge(
+        "FED_USER_Resource_Cost_List",
+        "FED USER Resource List And Cost",
+        labelnames=[
+            "resource_id",
+            "resource",
+            "account_id",
+            "region",
+            "resource_name",
+            "month"
+        ],
+        registry=registry
+    )
+
+    # Iterate through the data and populate the gauge
+    for resource in data1['ec2']:
+        resource_id = resource['resource_id']
+        service = resource['resource']
+        cost = resource['cost']
+        account_id = resource['account_id']
+        region = resource['region']
+        month = resource['month']
+        resource_name = resource_id.split(':')[-1]
+
+        # Set the gauge value
+        gauge.labels(
+            resource_id=resource_id,
+            resource=service,
+            account_id=account_id,
+            region=region,
+            resource_name=resource_name,
+            month=month
+        ).set(cost)
+
+    # Push the metrics to Prometheus Pushgateway
+    push_to_gateway('localhost:9091', job='pushgateway', registry=registry)
+
+# Call the function to push data to Prometheus
+push_to_prometheus(data1)
\ No newline at end of file
diff --git a/custom_dashboard/dummy_local/dummy.md b/custom_dashboard/dummy_local/dummy.md
new file mode 100755
index 00000000..82096fea
--- /dev/null
+++ b/custom_dashboard/dummy_local/dummy.md
@@ -0,0 +1 @@
+This is reference file for the dummy data that Team 12 used to showcase the Local Host Dashboard in the presentation
\ No newline at end of file
diff --git a/custom_dashboard/dummy_local/dummy_data1.json b/custom_dashboard/dummy_local/dummy_data1.json
new file mode 100755
index 00000000..9c0af079
--- /dev/null
+++ b/custom_dashboard/dummy_local/dummy_data1.json
@@ -0,0 +1,150 @@
+{
+    "ec2": [
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:590183937261:function:xc3team12pradhumna-list_linked_accounts",
+        "cost": 120.50,
+        "region": "us-east-1",
+        "resource": "lambda",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "January",
+        "resource_name": "xc3team12bhavabc-metadata-storage"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:123456789012:function:xc3team12pradhumna-iamrolesservicemapping",
+        "cost": 85.75,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "February",
+        "resource_name": "xc3team12bhavabc-iamrolestografana"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:234567890123:function:xc3team12pradhumna-list_iam_users",
+        "cost": 67.30,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "March",
+        "resource_name": "xc3team12bhavabc-iamrolesservicemapping"
+      },
+      {
+        "resource_id": "arn:aws:ec2:ap-southeast-2:345678901234:instance/i-0a3ea6b780458b3f5",
+        "cost": 215.00,
+        "region": "us-east-1",
+        "resource": "ec2",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "April",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:456789012345:function:xc3team12pradhumna-project-cost-breakdown",
+        "cost": 50.25,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "January",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:567890123456:function:xc3team12pradhumna-iamrolestografana",
+        "cost": 33.10,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "February",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:s3:::xc3team12pradhumna-metadata-storage",
+        "cost": 45.00,
+        "region": "us-west-1",
+        "resource": "s3",
+        "account_id": "Nilanshu-Basnet",
+        "month": "March",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      
+      },
+      {
+        "resource_id": "arn:aws:s3:::xc3team12sb-metadata-storage",
+        "cost": 27.15,
+        "region": "us-west-1",
+        "resource": "s3",
+        "account_id": "Nilanshu-Basnet",
+        "month": "April",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:890123456789:function:xc3team12pradhumna-resource_parsing_lambda",
+        "cost": 95.00,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "January",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:901234567890:function:xc3team12pradhumna-list_iam_user_resources_cost",
+        "cost": 120.00,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "February",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:012345678901:function:xc3team12pradhumna-resource_list_lambda",
+        "cost": 60.40,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "March",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:590183937261:function:xc3team12pradhumna-total_account_cost",
+        "cost": 130.50,
+        "region": "ap-southeast-2",
+        "resource": "lambda",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "April",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:s3:ap-southeast-2:590183937261:function:xc3team12pradhumna-most_expensive_service_lambda",
+        "cost": 175.75,
+        "region": "ap-southeast-2",
+        "resource": "s3",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "January",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:590183937261:function:xc3team12pradhumna-cost_metrics_of_expensive_services",
+        "cost": 49.95,
+        "region": "eu-west-1",
+        "resource": "lambda",
+        "account_id": "Pradhumna-Dhungana",
+        "month": "February",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:ec2:ap-southeast-2:590183937261:function:xc3team12pradhumna-instancestatechange",
+        "cost": 23.20,
+        "region": "ap-southeast-2",
+        "resource": "ec2",
+        "account_id": "Nilanshu-Basnet",
+        "month": "March",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      },
+      {
+        "resource_id": "arn:aws:lambda:ap-southeast-2:590183937261:function:xc3team12pradhumna-project-spend-cost",
+        "cost": 88.40,
+        "region": "eu-west-1",
+        "resource": "lambda",
+        "account_id": "Nilanshu-Basnet",
+        "month": "April",
+        "resource_name": "xc3team12bhavabc-cost_metrics_of_expensive_services"
+      }
+    ]
+  }
+  
\ No newline at end of file
diff --git a/custom_dashboard/grafana_dashboards/associated-services.json b/custom_dashboard/grafana_dashboards/associated-services.json
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_dashboards/fed-iam-user.json b/custom_dashboard/grafana_dashboards/fed-iam-user.json
new file mode 100755
index 00000000..5acd1d18
--- /dev/null
+++ b/custom_dashboard/grafana_dashboards/fed-iam-user.json
@@ -0,0 +1,741 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 5,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 11,
+      "panels": [],
+      "title": "Account Wise Cost",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 5,
+        "x": 0,
+        "y": 1
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "editorMode": "code",
+          "expr": "sum(FED_USER_Resource_Cost_List{account_id=~\".*\"})",
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Total Spent on Federated IAM Users",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 5,
+        "y": 1
+      },
+      "id": 9,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "code",
+          "expr": "count(count by (account_id) (FED_USER_Resource_Cost_List))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Active Fed Users",
+      "type": "stat"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "percentage",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "#EAB839",
+                "value": 60
+              },
+              {
+                "color": "red",
+                "value": 90
+              }
+            ]
+          },
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 15,
+        "w": 10,
+        "x": 8,
+        "y": 1
+      },
+      "id": 4,
+      "links": [
+        {
+          "targetBlank": true,
+          "title": "Cost Details",
+          "url": "/d/adiesz3lsuq68b/federated-iam-user-cost?orgId=1&var-Account_ID=All&var-month=All&editPanel=5"
+        }
+      ],
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "sizing": "auto",
+        "text": {
+          "valueSize": 20
+        },
+        "valueMode": "color"
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(account_id) (FED_USER_Resource_Cost_List{account_id=~\"$Account_ID\", month=~\"$month\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{account_id}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Total Cost of all the Federated IAM User",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": [],
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 1
+      },
+      "id": 5,
+      "options": {
+        "displayLabels": [],
+        "legend": {
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "values": [
+            "percent",
+            "value"
+          ]
+        },
+        "pieType": "donut",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sum by(resource) (sum without(region, resource_id, resource_name) (FED_USER_Resource_Cost_List{account_id=~\"$Account_ID\", month=~\"$month\"}))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Cost Split in AWS Services",
+      "type": "piechart"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 8,
+        "x": 0,
+        "y": 5
+      },
+      "id": 8,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
+        "orientation": "vertical",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "sizing": "auto",
+        "text": {
+          "titleSize": 12,
+          "valueSize": 20
+        },
+        "valueMode": "color"
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "sort(sum by(month) (FED_USER_Resource_Cost_List{month=~\"$month\"}))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Cost by Month",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "fieldMinMax": false,
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "percentage",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 6,
+        "x": 18,
+        "y": 8
+      },
+      "id": 7,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 236,
+        "minVizHeight": 6,
+        "minVizWidth": 10,
+        "namePlacement": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "sizing": "manual",
+        "text": {
+          "titleSize": 12,
+          "valueSize": 20
+        },
+        "valueMode": "color"
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "sum by(region) (FED_USER_Resource_Cost_List{account_id=~\"$Account_ID\", month=~\"$month\"})",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{Region}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Region wise Cost",
+      "type": "bargauge"
+    },
+    {
+      "collapsed": false,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 16
+      },
+      "id": 12,
+      "panels": [],
+      "title": "Resource Wise Cost",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "currencyUSD"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 17,
+        "x": 1,
+        "y": 17
+      },
+      "id": 10,
+      "options": {
+        "displayMode": "gradient",
+        "maxVizHeight": 300,
+        "minVizHeight": 16,
+        "minVizWidth": 8,
+        "namePlacement": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": true,
+        "sizing": "auto",
+        "valueMode": "color"
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "PBFA97CFB590B2093"
+          },
+          "disableTextWrap": false,
+          "editorMode": "builder",
+          "expr": "FED_USER_Resource_Cost_List{resource_name=~\"$resource_name\", account_id=~\"$Account_ID\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "{{resource_name}}",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Resource Wise Cost",
+      "type": "bargauge"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "PBFA97CFB590B2093"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 4,
+        "w": 3,
+        "x": 18,
+        "y": 17
+      },
+      "id": 13,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.4.2",
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus"
+          },
+          "disableTextWrap": false,
+          "editorMode": "code",
+          "expr": "count(count by (resource_name) (FED_USER_Resource_Cost_List))",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
+          "instant": false,
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A",
+          "useBackend": false
+        }
+      ],
+      "title": "Active resources",
+      "type": "stat"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "allValue": "",
+        "current": {
+          "selected": true,
+          "text": "Pradhumna-Dhungana",
+          "value": "Pradhumna-Dhungana"
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "definition": "label_values(FED_USER_Resource_Cost_List,account_id)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Fed User",
+        "multi": false,
+        "name": "Account_ID",
+        "options": [],
+        "query": {
+          "qryType": 1,
+          "query": "label_values(FED_USER_Resource_Cost_List,account_id)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "allValue": "",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "definition": "label_values(FED_USER_Resource_Cost_List,month)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Month",
+        "multi": false,
+        "name": "month",
+        "options": [],
+        "query": {
+          "qryType": 1,
+          "query": "label_values(FED_USER_Resource_Cost_List,month)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 3,
+        "type": "query"
+      },
+      {
+        "allValue": "",
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "PBFA97CFB590B2093"
+        },
+        "definition": "label_values(FED_USER_Resource_Cost_List,resource_name)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Resource Name",
+        "multi": false,
+        "name": "resource_name",
+        "options": [],
+        "query": {
+          "qryType": 1,
+          "query": "label_values(FED_USER_Resource_Cost_List,resource_name)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Federated IAM User Cost",
+  "uid": "adiesz3lsuq68b",
+  "version": 1,
+  "weekStart": ""
+}
\ No newline at end of file
diff --git a/custom_dashboard/grafana_dashboards/grafana-dashboard.md b/custom_dashboard/grafana_dashboards/grafana-dashboard.md
old mode 100644
new mode 100755
index 99a58e8a..a559f0fd
--- a/custom_dashboard/grafana_dashboards/grafana-dashboard.md
+++ b/custom_dashboard/grafana_dashboards/grafana-dashboard.md
@@ -37,6 +37,17 @@ The IAM User Dashboard consists of the following panels:
 - Resource Cost (Last 14 days)
 - Total Services Cost of IAM User
 
+## **Federated IAM User Dashboard**
+
+The Federated IAM User Dashboard consists of the following panels:
+-Total Spent on Federated IAM Users
+-Active Federated IAM Users
+-Cost by Month
+-Total Cost of all the Federated IAM Users
+-Cost Split in AWS Services
+-Region-wise Cost
+
+
 ## **Tagging Compliance**
 
 The tagging compliance dashboard consists of the following panel:
@@ -56,4 +67,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
\ No newline at end of file
diff --git a/custom_dashboard/grafana_dashboards/grafana_alerts.md b/custom_dashboard/grafana_dashboards/grafana_alerts.md
new file mode 100755
index 00000000..bcc9b180
--- /dev/null
+++ b/custom_dashboard/grafana_dashboards/grafana_alerts.md
@@ -0,0 +1,55 @@
+# Setting Up Grafana Alerts to Slack
+
+## Introduction
+
+Keeping the team updated with critical alerts is crucial for the swift response to any issues that may arise. This guide will cover the setup of Grafana alerts to be automatically sent to a designated Slack channel.
+
+## Prerequisites
+
+- A Grafana server instance with admin access.
+- A Slack workspace with permissions to add apps and create webhooks.
+
+## Configuring Grafana Alerts for Slack
+
+### 1. Create a Slack Webhook
+
+- Navigate to your Slack workspace and create an incoming webhook:
+  - Go to `https://<your-workspace>.slack.com/apps`.
+  - Search for **Incoming Webhooks** and select "Add Configuration".
+  - Choose the channel where messages will be posted.
+  - Copy the Webhook URL provided.
+
+### 2. Add Slack Notification Channel in Grafana
+
+- Log in to your Grafana instance as an administrator.
+- Go to "Alerting" and select "Notification channels".
+- Click on "Add channel".
+- Choose "Slack" as the type.
+- Paste the Slack Webhook URL in the corresponding field.
+- Name your notification channel for easy identification.
+- Save the new notification channel.
+
+### 3. Configure Alert Rules
+
+- Go to the Grafana dashboard with the panel you want to set an alert for.
+- Right on the title of the panel and select "Alerts".
+- Create a new alert rule and define your conditions.
+- Under "Send to", select the Slack notification channel you created.
+- Save the alert rule.
+
+### 4. Test Your Notification
+
+- Once your alert is set up, simulate the condition that triggers the alert or use the "Test" function to send a test message to Slack.
+- Confirm that the message appears in the Slack channel.
+
+## Automating Alert Notifications
+
+Grafana can be configured to periodically check alert rules and send notifications to Slack when conditions are met. Here are the steps for automation:
+
+- Navigate to the alert rule you've created.
+- Under "Alert frequency", set how often Grafana should evaluate the alert condition.
+- Ensure "Notifications" are enabled and configured properly.
+
+## Conclusion
+
+With Grafana alerts now set to deliver notifications to your Slack channel, your team can enjoy real-time updates, ensuring prompt responses to critical metrics. Remember to fine-tune alert conditions to avoid spamming the channel with notifications.
diff --git a/custom_dashboard/grafana_dashboards/home-dashboard.json b/custom_dashboard/grafana_dashboards/home-dashboard.json
old mode 100644
new mode 100755
index 49e6c1cd..1ece0e69
--- a/custom_dashboard/grafana_dashboards/home-dashboard.json
+++ b/custom_dashboard/grafana_dashboards/home-dashboard.json
@@ -415,7 +415,7 @@
           },
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "Expensive_Services_Detail{job=\"Most_Expensive_Services\", region=\"$region\", account=\"$Account\"}",
+          "expr": "Expensive_Services_Detail{job=\"$Account\", region=\"$region\"}",
           "format": "table",
           "instant": true,
           "legendFormat": "__auto",
diff --git a/custom_dashboard/grafana_dashboards/iam-role-dashboard.json b/custom_dashboard/grafana_dashboards/iam-role-dashboard.json
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_dashboards/iam-user-dashboard.json b/custom_dashboard/grafana_dashboards/iam-user-dashboard.json
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_dashboards/services-breakdown.json b/custom_dashboard/grafana_dashboards/services-breakdown.json
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_dashboards/tagging-compliance-dashboard.json b/custom_dashboard/grafana_dashboards/tagging-compliance-dashboard.json
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_panel_start_stop/grafana_panel_start_stop.md b/custom_dashboard/grafana_panel_start_stop/grafana_panel_start_stop.md
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_panel_start_stop/start_stop_panel.html b/custom_dashboard/grafana_panel_start_stop/start_stop_panel.html
old mode 100644
new mode 100755
diff --git a/custom_dashboard/grafana_panel_start_stop/start_stop_panel.js b/custom_dashboard/grafana_panel_start_stop/start_stop_panel.js
old mode 100644
new mode 100755
diff --git a/infrastructure/backend.tf b/infrastructure/backend.tf
index 6f2f0ab9..eff5f709 100644
--- a/infrastructure/backend.tf
+++ b/infrastructure/backend.tf
@@ -16,9 +16,9 @@
 
 terraform {
   backend "s3" {
-    bucket         = "terraform-state-xc3" // S3 bucket for terraform state management
+    bucket         = "terraform-state-team12nilanshu" // S3 bucket for terraform state management
     key            = "xc3/xc3.tfstate"        // Specifies the S3 object key for storing the Terraform state file
-    region         = "eu-west-1"
+    region         = "ap-southeast-2"
     dynamodb_table = "terraform-lock"
   }
 }
diff --git a/infrastructure/config.sh b/infrastructure/config.sh
index 3c1aaf7f..e78b43a9 100644
--- a/infrastructure/config.sh
+++ b/infrastructure/config.sh
@@ -15,12 +15,12 @@
 # limitations under the License.
 
 # Variables values that will be used in init script to create resources for XC3 infrastructure
-export aws_region="eu-west-1"
+export aws_region="ap-southeast-2"
 export dynamo_table_name="terraform-lock"
-export bucket_name="terraform-state-xc3"
-export project="example"
+export bucket_name="terraform-state-team12nilanshu"
+export project="xc3team12nilanshu"
 export domain="example.test.co"
-export owner_email="admin@test.co"
-export creator_email="admin@test.co"
-export namespace="example"
-export env="example"
+export owner_email="104346575@student.swin.edu.au"
+export creator_email="104346575@student.swin.edu.au"
+export namespace="xc3team12nilanshu"
+export env="dev"
diff --git a/infrastructure/errored.tfstate b/infrastructure/errored.tfstate
new file mode 100644
index 00000000..95332b88
--- /dev/null
+++ b/infrastructure/errored.tfstate
@@ -0,0 +1,265 @@
+{
+  "version": 4,
+  "terraform_version": "1.5.7",
+  "serial": 31,
+  "lineage": "30a5748b-2212-3176-6e6c-d267d4d0fb13",
+  "outputs": {},
+  "resources": [
+    {
+      "module": "module.networking",
+      "mode": "managed",
+      "type": "aws_security_group",
+      "name": "serverless_sg",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ec2:ap-southeast-2:590183937261:security-group/sg-02635dbb83ed1dba9",
+            "description": "XC3 serverless module access for updates",
+            "egress": [
+              {
+                "cidr_blocks": [
+                  "0.0.0.0/0"
+                ],
+                "description": "output from serverless sg",
+                "from_port": 0,
+                "ipv6_cidr_blocks": [],
+                "prefix_list_ids": [],
+                "protocol": "-1",
+                "security_groups": [],
+                "self": false,
+                "to_port": 0
+              }
+            ],
+            "id": "sg-02635dbb83ed1dba9",
+            "ingress": [
+              {
+                "cidr_blocks": [
+                  "10.0.100.0/24"
+                ],
+                "description": "All Traffic",
+                "from_port": 0,
+                "ipv6_cidr_blocks": [],
+                "prefix_list_ids": [],
+                "protocol": "tcp",
+                "security_groups": [],
+                "self": false,
+                "to_port": 65535
+              }
+            ],
+            "name": "xc3team12nilanshu_serverless_security_group",
+            "name_prefix": "",
+            "owner_id": "590183937261",
+            "revoke_rules_on_delete": false,
+            "tags": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Serverless-SG",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "tags_all": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Serverless-SG",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "timeouts": null,
+            "vpc_id": "vpc-0be35a9f83d0a034d"
+          },
+          "sensitive_attributes": [],
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6OTAwMDAwMDAwMDAwfSwic2NoZW1hX3ZlcnNpb24iOiIxIn0=",
+          "dependencies": [
+            "module.networking.aws_subnet.private_subnet",
+            "module.networking.aws_vpc.this"
+          ]
+        }
+      ]
+    },
+    {
+      "module": "module.networking",
+      "mode": "managed",
+      "type": "aws_subnet",
+      "name": "private_subnet",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "index_key": "ap-southeast-2a",
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ec2:ap-southeast-2:590183937261:subnet/subnet-0bd6dbf349d8eb6b6",
+            "assign_ipv6_address_on_creation": false,
+            "availability_zone": "ap-southeast-2a",
+            "availability_zone_id": "apse2-az3",
+            "cidr_block": "10.0.100.0/24",
+            "customer_owned_ipv4_pool": "",
+            "enable_dns64": false,
+            "enable_lni_at_device_index": 0,
+            "enable_resource_name_dns_a_record_on_launch": false,
+            "enable_resource_name_dns_aaaa_record_on_launch": false,
+            "id": "subnet-0bd6dbf349d8eb6b6",
+            "ipv6_cidr_block": "",
+            "ipv6_cidr_block_association_id": "",
+            "ipv6_native": false,
+            "map_customer_owned_ip_on_launch": false,
+            "map_public_ip_on_launch": false,
+            "outpost_arn": "",
+            "owner_id": "590183937261",
+            "private_dns_hostname_type_on_launch": "ip-name",
+            "tags": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Private-Subnet-ap-southeast-2a",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "tags_all": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Private-Subnet-ap-southeast-2a",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "timeouts": null,
+            "vpc_id": "vpc-0be35a9f83d0a034d"
+          },
+          "sensitive_attributes": [],
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6MTIwMDAwMDAwMDAwMH0sInNjaGVtYV92ZXJzaW9uIjoiMSJ9",
+          "dependencies": [
+            "module.networking.aws_vpc.this"
+          ]
+        }
+      ]
+    },
+    {
+      "module": "module.networking",
+      "mode": "managed",
+      "type": "aws_vpc",
+      "name": "this",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ec2:ap-southeast-2:590183937261:vpc/vpc-0be35a9f83d0a034d",
+            "assign_generated_ipv6_cidr_block": false,
+            "cidr_block": "10.0.0.0/16",
+            "default_network_acl_id": "acl-0d508465690f607ad",
+            "default_route_table_id": "rtb-0055304719580c8a6",
+            "default_security_group_id": "sg-038e88cc13bdee643",
+            "dhcp_options_id": "dopt-073c4c6800a962a07",
+            "enable_dns_hostnames": true,
+            "enable_dns_support": true,
+            "enable_network_address_usage_metrics": false,
+            "id": "vpc-0be35a9f83d0a034d",
+            "instance_tenancy": "default",
+            "ipv4_ipam_pool_id": null,
+            "ipv4_netmask_length": null,
+            "ipv6_association_id": "",
+            "ipv6_cidr_block": "",
+            "ipv6_cidr_block_network_border_group": "",
+            "ipv6_ipam_pool_id": "",
+            "ipv6_netmask_length": 0,
+            "main_route_table_id": "rtb-0055304719580c8a6",
+            "owner_id": "590183937261",
+            "tags": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-VPC",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "tags_all": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-VPC",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            }
+          },
+          "sensitive_attributes": [],
+          "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ=="
+        }
+      ]
+    },
+    {
+      "module": "module.xc3",
+      "mode": "managed",
+      "type": "aws_s3_bucket",
+      "name": "this",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 0,
+          "attributes": {
+            "acceleration_status": "",
+            "acl": null,
+            "arn": "arn:aws:s3:::xc3team12nilanshu-metadata-storage",
+            "bucket": "xc3team12nilanshu-metadata-storage",
+            "bucket_domain_name": "xc3team12nilanshu-metadata-storage.s3.amazonaws.com",
+            "bucket_prefix": "",
+            "bucket_regional_domain_name": "xc3team12nilanshu-metadata-storage.s3.ap-southeast-2.amazonaws.com",
+            "cors_rule": [],
+            "force_destroy": false,
+            "grant": [
+              {
+                "id": "2907c02c17f04ba6a28e6c4d72a44571ab54668383935c8b496119df3e7ac0b6",
+                "permissions": [
+                  "FULL_CONTROL"
+                ],
+                "type": "CanonicalUser",
+                "uri": ""
+              }
+            ],
+            "hosted_zone_id": "Z1WCIGYICN2BYD",
+            "id": "xc3team12nilanshu-metadata-storage",
+            "lifecycle_rule": [],
+            "logging": [],
+            "object_lock_configuration": [],
+            "object_lock_enabled": false,
+            "policy": "",
+            "region": "ap-southeast-2",
+            "replication_configuration": [],
+            "request_payer": "BucketOwner",
+            "server_side_encryption_configuration": [
+              {
+                "rule": [
+                  {
+                    "apply_server_side_encryption_by_default": [
+                      {
+                        "kms_master_key_id": "",
+                        "sse_algorithm": "AES256"
+                      }
+                    ],
+                    "bucket_key_enabled": false
+                  }
+                ]
+              }
+            ],
+            "tags": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Bucket",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "tags_all": {
+              "Creator": "104346575@student.swin.edu.au",
+              "Name": "xc3team12nilanshu-Bucket",
+              "Owner": "104346575@student.swin.edu.au",
+              "Project": "xc3team12nilanshu"
+            },
+            "timeouts": null,
+            "versioning": [
+              {
+                "enabled": true,
+                "mfa_delete": false
+              }
+            ],
+            "website": [],
+            "website_domain": null,
+            "website_endpoint": null
+          },
+          "sensitive_attributes": [],
+          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjM2MDAwMDAwMDAwMDAsInJlYWQiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19"
+        }
+      ]
+    }
+  ],
+  "check_results": null
+}
diff --git a/infrastructure/main.tf b/infrastructure/main.tf
index c52e1df1..693f39fd 100644
--- a/infrastructure/main.tf
+++ b/infrastructure/main.tf
@@ -83,4 +83,6 @@ module "serverless" {
   create_cloudtrail           = var.create_cloudtrail
   create_cloudtrail_s3_bucket = var.create_cloudtrail_s3_bucket
   env                         = var.env
+  slack_webhook_url = var.slack_webhook_url
+  snsendpoint = var.snsendpoint
 }
diff --git a/infrastructure/modules/serverless/cloudtrail.tf b/infrastructure/modules/serverless/cloudtrail.tf
index 9b0a1f9d..32102b5a 100644
--- a/infrastructure/modules/serverless/cloudtrail.tf
+++ b/infrastructure/modules/serverless/cloudtrail.tf
@@ -16,11 +16,18 @@
 resource "aws_s3_bucket" "this" {
   #ts:skip=AWS.S3Bucket.IAM.High.0370 We are aware of the risk and choose to skip this rule
   count = var.create_cloudtrail_s3_bucket ? 1 : 0
-
   bucket = "${var.namespace}-cloudtrail-logs-storage"
   tags   = merge(local.tags, tomap({ "Name" = "${var.namespace}-bucket" }))
 }
 
+resource "aws_s3_bucket_versioning" "this" {
+  count = var.create_cloudtrail_s3_bucket ? 1 : 0
+  bucket = aws_s3_bucket.this[count.index].id
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
 # Create a CloudTrail trail and enable logging to the S3 bucket
 resource "aws_cloudtrail" "this" {
   count = var.create_cloudtrail ? 1 : 0
diff --git a/infrastructure/modules/serverless/eventbridge.tf b/infrastructure/modules/serverless/eventbridge.tf
new file mode 100644
index 00000000..74128c6f
--- /dev/null
+++ b/infrastructure/modules/serverless/eventbridge.tf
@@ -0,0 +1,25 @@
+# Define the EventBridge rule for the cron job
+resource "aws_cloudwatch_event_rule" "federated_cron_job" {
+  name                = "federated-cron-job"
+  description         = "Cron job to invoke lambda to get all the federated users and resources provisioned by them."
+  #schedule_expression = "cron(0 0 */14 * ? *)"  # Runs every 14 days
+  schedule_expression = "cron(0 0 * * ? *)"
+
+  # Runs every minute
+  # schedule_expression = "cron(*/1 * * * ? *)"
+
+# Add tags for better organization and management
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-federatedCron-job" }))
+}
+
+
+
+
+data "aws_caller_identity" "current" {}
+
+# Define the target to invoke the Lambda function
+resource "aws_cloudwatch_event_target" "invoke_lambda" {
+  rule      = aws_cloudwatch_event_rule.federated_cron_job.name
+  target_id = "invoke-lambda-target"
+  arn       = "arn:aws:lambda:${var.region}:${data.aws_caller_identity.current.account_id}:function:${var.namespace}-list_fed_users"  
+}
diff --git a/infrastructure/modules/serverless/fed-user.tf b/infrastructure/modules/serverless/fed-user.tf
new file mode 100644
index 00000000..6d3174f0
--- /dev/null
+++ b/infrastructure/modules/serverless/fed-user.tf
@@ -0,0 +1,198 @@
+
+# Creating Inline policy
+resource "aws_iam_role_policy" "fed_user_policy" {
+  name = "${var.namespace}-fed_user_policy"
+  role = aws_iam_role.fed-user_role.id
+  policy = jsonencode({
+    "Version" : "2012-10-17",
+    "Statement" : [
+      {
+        "Sid" : "Costexplorer",
+        "Effect" : "Allow",
+        "Action" : [
+          "ce:GetCostAndUsage",
+          "ce:GetCostAndUsageWithResources",
+          "ec2:CreateNetworkInterface",
+          "ec2:DescribeNetworkInterfaces",
+          "ec2:DetachNetworkInterface",
+          "ec2:AttachNetworkInterface",
+          "ec2:DeleteNetworkInterface",
+          "ec2:DescribeRegions",
+          "SNS:Publish",
+          "iam:ListRoles",
+          "iam:ListUsers",
+          "lambda:ListTags",
+          "s3:PutObject",
+          "s3:GetObject",
+          "tag:GetResources",
+          "cloudtrail:LookupEvents"
+        ]
+         Effect   = "Allow"
+        "Resource" : "*"
+        
+      },
+     
+    ]
+  })
+}
+
+
+
+# Creating IAM Role for Lambda functions
+resource "aws_iam_role" "fed-user_role" {
+  name = "${var.namespace}-fed-user_role"
+  assume_role_policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Action = "sts:AssumeRole"
+        Effect = "Allow"
+        Sid    = ""
+        Principal = {
+          Service = "lambda.amazonaws.com"
+        }
+      }
+    ]
+  })
+  managed_policy_arns = [
+    "arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess",
+    "arn:aws:iam::aws:policy/ResourceGroupsandTagEditorReadOnlyAccess",
+    "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole",
+    "arn:aws:iam::aws:policy/AWSLambda_FullAccess",
+    "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+  ]
+
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-fed-user_role" }))
+}
+
+
+data "archive_file" "fed_user_resource_zip" {
+  type        = "zip"
+  source_dir  = "../src/federated_user"
+  output_path = "${path.module}/fed_user_resource.zip"
+
+}
+
+
+data "archive_file" "list_fed_user_zip" {
+  type        = "zip"
+  source_dir  = "../src/federated_user"
+  output_path = "${path.module}/list_fed_user.zip"
+
+}
+
+resource "aws_lambda_function" "fed_user_resource" {
+  #ts:skip=AC_AWS_0485 We are aware of the risk and choose to skip this rule
+  #ts:skip=AC_AWS_0483 We are aware of the risk and choose to skip this rule
+  #ts:skip=AC_AWS_0484 We are aware of the risk and choose to skip this rule
+  function_name = "${var.namespace}-fed_user_resource"
+  role          = aws_iam_role.fed-user_role.arn
+  runtime       = "python3.9"
+  handler       = "fed_user_resource.lambda_handler"
+   filename      = data.archive_file.fed_user_resource_zip.output_path
+  environment {
+    variables = {
+      prometheus_ip = "${var.prometheus_ip}:9091"
+      region_names_path = "/${var.namespace}/region_names"
+      bucket_name = var.s3_xc3_bucket.bucket
+    }
+  }
+  memory_size = var.memory_size
+  timeout     = var.timeout
+  layers      = [var.prometheus_layer]
+  vpc_config {
+    subnet_ids         = [var.subnet_id[0]]
+    security_group_ids = [var.security_group_id]
+  }
+  depends_on = [
+    aws_lambda_function.list_fed_user
+  ]
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-fed_user_resource" }))
+
+}
+
+
+
+
+resource "terraform_data" "list_fed_user_zip" {
+  triggers_replace = [aws_lambda_function.list_fed_user.arn]
+  provisioner "local-exec" {
+    command = "rm -r ${data.archive_file.list_fed_user_zip.output_path}"
+  }
+}
+
+
+resource "terraform_data" "fed_user_resource_zip" {
+  triggers_replace = [aws_lambda_function.fed_user_resource.arn]
+  provisioner "local-exec" {
+    command = "rm -r ${data.archive_file.fed_user_resource_zip.output_path}"
+  }
+}
+
+
+resource "aws_lambda_function" "list_fed_user" {
+  #ts:skip=AC_AWS_0484 We are aware of the risk and choose to skip this rule
+  #ts:skip=AC_AWS_0485 We are aware of the risk and choose to skip this rule
+  #ts:skip=AC_AWS_0483 We are aware of the risk and choose to skip this rule
+  function_name = "${var.namespace}-list_fed_users"
+  role          = aws_iam_role.fed-user_role.arn
+  runtime       = "python3.9"
+  handler       = "list_fed_user.lambda_handler"
+  filename      = data.archive_file.list_fed_user_zip.output_path
+  environment {
+    variables = {
+      prometheus_ip = "${var.prometheus_ip}:9091"
+      REGION        = var.region
+      sns_topic     = var.sns_topic_arn
+      bucket_name   = var.s3_xc3_bucket.bucket
+      UNTAGGED_RESOURCE_LAMBDA_ARN = aws_lambda_function.resource_notification_lambda.arn
+
+    }
+  }
+  memory_size = var.memory_size
+  timeout     = var.timeout
+  layers      = [var.prometheus_layer]
+  vpc_config {
+    subnet_ids         = [var.subnet_id[0]]
+    security_group_ids = [var.security_group_id]
+  }
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-list_fed_user" }))
+}
+
+
+resource "aws_s3_object" "example_folder" {
+  bucket = var.s3_xc3_bucket.bucket
+  key    = "fed-resources/" 
+}
+
+
+resource "aws_s3_bucket_notification" "fed_user_trigger" {
+  bucket = var.s3_xc3_bucket.id
+  lambda_function {
+    lambda_function_arn = aws_lambda_function.fed_user_resource.arn
+    filter_prefix       = "fed-resources/"
+    events              = ["s3:ObjectCreated:Put"]
+    filter_suffix       = "resources.json"
+  }
+}
+
+
+
+resource "aws_lambda_permission" "allow_buckets_for_trigger" {
+  statement_id  = "AllowExecutionFromS3Bucket"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.fed_user_resource.arn
+  principal     = "s3.amazonaws.com"
+  source_arn    = var.s3_xc3_bucket.arn
+}
+
+
+# Grant permission to EventBridge to invoke the Lambda function
+# -------------------------------------------------------------
+resource "aws_lambda_permission" "allow_eventbridge_invoke" {
+  statement_id  = "AllowExecutionFromEventBridge"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.list_fed_user.function_name
+  principal     = "events.amazonaws.com"
+  source_arn    = aws_cloudwatch_event_rule.federated_cron_job.arn
+}
\ No newline at end of file
diff --git a/infrastructure/modules/serverless/resource_notification.tf b/infrastructure/modules/serverless/resource_notification.tf
new file mode 100644
index 00000000..c4da1817
--- /dev/null
+++ b/infrastructure/modules/serverless/resource_notification.tf
@@ -0,0 +1,74 @@
+# IAM Role for resource_notification Lambda Function
+# -----------------------------------------
+# This resource block defines an IAM role for the Lambda function named resource_notification_lambda.
+
+resource "aws_iam_role" "resource_notification_lambda_role" {
+  name = "${var.namespace}-resource_notification_lambda_execution_role"  # Name of the IAM role
+  
+  # Policy allowing Lambda service to assume the role
+  assume_role_policy = jsonencode({
+    "Version" : "2012-10-17",
+    "Statement" : [
+      {
+        "Effect" : "Allow",
+        "Principal" : {
+          "Service" : "lambda.amazonaws.com"
+        },
+        "Action" : "sts:AssumeRole"
+      }
+    ]
+  })
+
+  # Attach required managed policies to the role
+  managed_policy_arns = [
+    "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole",
+    "arn:aws:iam::aws:policy/AmazonSNSFullAccess",
+    "arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess"
+  ]
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-resource-notification-lambda-execution-role" }))
+}
+
+
+# Archive Lambda function code
+# -----------------------------
+# This data source archives the Lambda function code located in the "src/federated_user" directory.
+
+data "archive_file" "resource_notification_lambda_zip" {
+  type        = "zip"
+  source_dir  = "../src/federated_user"
+  output_path = "${path.module}/resource_notification_lambda.zip"
+}
+
+
+# Lambda Function - resource_notification
+# ------------------------------
+# This resource block defines the Lambda function named resource_notification_lambda.
+
+resource "aws_lambda_function" "resource_notification_lambda" {
+  filename      = data.archive_file.resource_notification_lambda_zip.output_path  # Path to the Lambda function code zip archive
+  function_name = "${var.namespace}-resource_notification_lambda"  # Name of the Lambda function
+  role          = aws_iam_role.resource_notification_lambda_role.arn  # IAM role ARN attached to the Lambda function
+  handler       = "resource_notification.lambda_handler"  # Entry point to the Lambda function
+  runtime       = "python3.8"  # Runtime environment for the Lambda function
+
+  # Environment variables passed to the Lambda function
+  environment {
+    variables = {
+      SNS_TOPIC_ARN = aws_sns_topic.resource_alert.arn  # Pass the ARN of the SNS topic as an environment variable
+      SLACK_WEBHOOK_URL = var.slack_webhook_url
+      NAME_SPACE = var.namespace
+    }
+  }
+
+# Add tags for better organization and management
+  tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-resource-notification-lambda" }))
+
+}
+
+
+resource "aws_lambda_permission" "allow_list_fed_user_invoke" {
+  statement_id  = "AllowExecutionFromListFedUserLambda"
+  action        = "lambda:InvokeFunction"
+  function_name = aws_lambda_function.resource_notification_lambda.arn
+  principal     = "lambda.amazonaws.com"
+}
diff --git a/infrastructure/modules/serverless/sns_topic.tf b/infrastructure/modules/serverless/sns_topic.tf
new file mode 100644
index 00000000..45495e4c
--- /dev/null
+++ b/infrastructure/modules/serverless/sns_topic.tf
@@ -0,0 +1,38 @@
+# AWS SNS Topic creation
+# -----------------------
+# This section creates an AWS SNS Topic named "resource_alert" to be used for resource alerts.
+
+resource "aws_sns_topic" "resource_alert" {
+  # Topic Name
+  # ----------
+  # Specifies the name of the SNS topic.
+  name        = "${var.namespace}-resource_alert"
+  
+  # Display Name
+  # ------------
+  # Specifies the display name of the SNS topic.
+  display_name = "Resource Alert"
+}
+
+# Subscription of an email address to the SNS topic
+# -------------------------------------------------
+# This section subscribes an email address to the "resource_alert" SNS topic for receiving notifications.
+
+resource "aws_sns_topic_subscription" "email_subscription" {
+  # Topic ARN
+  # ---------
+  # Specifies the ARN of the SNS topic to which the subscription will be made.
+  topic_arn = aws_sns_topic.resource_alert.arn
+  
+  # Protocol
+  # --------
+  # Specifies the protocol for the subscription. In this case, it's email.
+  protocol  = "email"
+  
+  # Endpoint
+  # --------
+  # Specifies the endpoint for the subscription, which is an email address.
+  endpoint  = var.snsendpoint
+
+
+}
diff --git a/infrastructure/modules/serverless/variables.tf b/infrastructure/modules/serverless/variables.tf
index 623bc392..822703cc 100644
--- a/infrastructure/modules/serverless/variables.tf
+++ b/infrastructure/modules/serverless/variables.tf
@@ -144,3 +144,12 @@ variable "env" {
   type        = string
 }
 
+ variable "snsendpoint" {
+    type = string
+    description = "endpoint for email notification"
+}
+
+variable "slack_webhook_url" {
+    type = string
+    description = "Webhook URL for slack notification."
+}
\ No newline at end of file
diff --git a/infrastructure/modules/xc3/main.tf b/infrastructure/modules/xc3/main.tf
index edaddcd0..0d67f2af 100644
--- a/infrastructure/modules/xc3/main.tf
+++ b/infrastructure/modules/xc3/main.tf
@@ -173,6 +173,13 @@ resource "aws_s3_bucket" "this" {
   tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-Bucket" }))
 }
 
+resource "aws_s3_bucket_versioning" "this" {
+  bucket = aws_s3_bucket.this.id
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
 # Uploading Cloud Custodian Policies and lambda layers in S3 bucket
 # tflint-ignore: terraform_required_providers
 resource "terraform_data" "upload_files_on_s3" {
@@ -180,6 +187,8 @@ resource "terraform_data" "upload_files_on_s3" {
 
   provisioner "local-exec" {
     command = <<EOT
+
+      # Upload files to the folder
       aws s3 cp python.zip s3://${aws_s3_bucket.this.id}/lambda_layers/
       aws s3 cp ../custom_dashboard/grafana_dashboards/. s3://${aws_s3_bucket.this.id}/content/ --recursive --exclude "*.md"
       aws s3 cp ../cloud_custodian_policies/ s3://${aws_s3_bucket.this.id}/cloud_custodian_policies/ --recursive --exclude "*.md" --include "*"
@@ -209,12 +218,12 @@ resource "aws_lambda_layer_version" "lambda_layer_prometheus" {
 
 ## Cloudwatch Alarms
 # tflint-ignore: terraform_required_providers
-resource "aws_cloudwatch_metric_alarm" "this" { 
-  alarm_name          = "${var.namespace}-xc3_cpu_usage_alarm"
+resource "aws_cloudwatch_metric_alarm" "cpu_utilization_queue_alarm" { 
+  alarm_name          = "${var.namespace}-xc3-cpu-usage-alarm"
   comparison_operator = "GreaterThanOrEqualToThreshold"
-  evaluation_periods = "2"
-  metric_name        = "${var.namespace}-xc3_cpu_utilization"
-  namespace          = var.namespace
+  evaluation_periods = "1"
+  metric_name        = "CPUUtilization"
+  namespace          = "AWS/EC2"
   period             = "300"
   statistic          = "Average"
   threshold          = "80"
@@ -227,6 +236,25 @@ resource "aws_cloudwatch_metric_alarm" "this" {
    tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-cpu_usage_alarm" }))
 }
 
+resource "aws_cloudwatch_metric_alarm" "sqs_queue_alarm" {
+  alarm_name          = "${var.namespace}-xc3-sqs-queue-alarm"
+  comparison_operator = "GreaterThanOrEqualToThreshold"
+  evaluation_periods = 1
+  metric_name        = "ApproximateAgeOfOldestMessage"
+  namespace          = "AWS/SQS"
+  period             = 300
+  statistic          = "Average"
+  threshold          = 10 
+  alarm_description  = "Alarm for SQS queue visibility threshold"
+  alarm_actions      = [aws_sns_topic.this.arn]
+
+  dimensions = {
+    QueueName = aws_sqs_queue.this.name
+  }
+
+   tags = merge(local.tags, tomap({ "Name" = "${var.namespace}-cpu_usage_alarm" }))
+}
+
 ## Creation of an WAFv2
 # tflint-ignore: terraform_required_providers
 resource "aws_wafv2_web_acl" "this" {
@@ -272,7 +300,7 @@ resource "aws_wafv2_web_acl" "this" {
 ## association code of webacl
 # tflint-ignore: terraform_required_providers
 resource "aws_wafv2_web_acl_association" "web_acl_association_with_lb" {
-  count        = var.env == "prod" && var.domain_name == "" ? 1 : 0
+  count        = var.env == "prod" && var.domain_name != "" ? 1 : 0
   resource_arn = aws_lb.this[0].arn
   web_acl_arn  = aws_wafv2_web_acl.this.arn
 }
diff --git a/infrastructure/terraform.auto.tfvars b/infrastructure/terraform.auto.tfvars
index fe68b285..9c639c99 100644
--- a/infrastructure/terraform.auto.tfvars
+++ b/infrastructure/terraform.auto.tfvars
@@ -12,36 +12,38 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-namespace      = "testing"
-env            = "prod"
-region         = "eu-west-1"
-account_id     = "123456789"
+namespace      = "xc3team12nilanshu"
+env            = "dev"
+snsendpoint = "mail@gmail.com"
+slack_webhook_url = "Webhook Here"
+region         = "ap-southeast-2"
+account_id     = "590183937261"
 vpc_cidr_block = "10.0.0.0/16"
 public_subnet_cidr_block = {
-  "eu-west-1a" = "10.0.0.0/24"
-  "eu-west-1b" = "10.0.1.0/24"
+  "ap-southeast-2a" = "10.0.0.0/24"
+  "ap-southeast-2b" = "10.0.1.0/24"
 }
 domain_name    = ""
 hosted_zone_id = "Z053166920YP1STI0EK5X"
 
 private_subnet_cidr_block = {
-  "eu-west-1a" = "10.0.100.0/24"
+  "ap-southeast-2a" = "10.0.100.0/24"
 }
 # private_subnet_cidr_block  = "10.0.100.0/24"
 allow_traffic               = ["0.0.0.0/0"] // Use your own network CIDR
-ses_email_address           = "testing@testing.co"
-creator_email               = "testing@testing.co"
-owner_email                 = "testing@testing.co"
+ses_email_address           = "104346575@student.swin.edu.au"
+creator_email               = "104346575@student.swin.edu.au"
+owner_email                 = "104346575@student.swin.edu.au"
 instance_type               = "t2.micro"
 total_account_cost_lambda   = "total_account_cost"
 total_account_cost_cronjob  = "cron(0 0 1,15 * ? *)"     // flexible can be set according to need
 prometheus_layer            = "lambda_layers/python.zip" // s3 key for lambda layer
 memory_size                 = 128
 timeout                     = 300
-project                     = "testing"
-create_cloudtrail_kms       = true
-create_cloudtrail           = true
-create_cloudtrail_s3_bucket = true
+project                     = "xc3team12nilanshu"
+create_cloudtrail_kms       = false
+create_cloudtrail           = false
+create_cloudtrail_s3_bucket = false
 security_group_ingress = {
   "pushgateway" = {
     description = "PushGateway"
diff --git a/infrastructure/terraform.test.tfvars b/infrastructure/terraform.test.tfvars
index 01fe2f84..5f1ebb66 100644
--- a/infrastructure/terraform.test.tfvars
+++ b/infrastructure/terraform.test.tfvars
@@ -14,6 +14,8 @@
 
 namespace      = "testing"
 env            = "test"
+snsendpoint = "test@gmail.com"
+slack_webhook_url = "write webhook link here"
 region         = "eu-west-1"
 account_id     = "123456789"
 vpc_cidr_block = "10.0.0.0/16"
diff --git a/infrastructure/variables.tf b/infrastructure/variables.tf
index fd9738f6..65927ac2 100644
--- a/infrastructure/variables.tf
+++ b/infrastructure/variables.tf
@@ -158,3 +158,14 @@ variable "env" {
   type        = string
   default     = "dev"
 }
+
+
+ variable "snsendpoint" {
+    type = string
+    description = "endpoint for email notification"
+}
+
+variable "slack_webhook_url" {
+    type = string
+    description = "Webhook URL for slack notification."
+}
\ No newline at end of file
diff --git a/pre_requirement/iam.tf b/pre_requirement/iam.tf
index 4b5f89c5..fe34288b 100644
--- a/pre_requirement/iam.tf
+++ b/pre_requirement/iam.tf
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 locals {
   tags = {
     Owner   = var.owner_email
diff --git a/pre_requirement/terraform.auto.tfvars b/pre_requirement/terraform.auto.tfvars
index f2d8dfe9..e7e7bca6 100644
--- a/pre_requirement/terraform.auto.tfvars
+++ b/pre_requirement/terraform.auto.tfvars
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 
-project       = "example"
-creator_email = "example@example.co"
-owner_email   = "example@example.co"
-namespace     = "example"
-region        = "eu-west-1"
+project       = "xc3team12nilanshu"
+creator_email = "104346575@student.swin.edu.au"
+owner_email   = "104346575@student.swin.edu.au"
+namespace     = "xc3team12nilanshu"
+region        = "ap-southeast-2"
diff --git a/src/expensive_services_detail/cost_metrics_of_expensive_services.py b/src/expensive_services_detail/cost_metrics_of_expensive_services.py
index 068dd740..3f234f6e 100644
--- a/src/expensive_services_detail/cost_metrics_of_expensive_services.py
+++ b/src/expensive_services_detail/cost_metrics_of_expensive_services.py
@@ -173,7 +173,7 @@ def lambda_handler(event, context):
         for resource in top_5_resources:
             resourcedata = {
                 "Account": account_detail,
-                "Region": f"{region} ({region_names.get(region, 'unknown region name')})",
+                "Region": f"{region}-{region_names.get(region, 'unknown region name')}",
                 "Service": resource["Keys"][0],
                 "Cost": resource["Metrics"]["UnblendedCost"]["Amount"],
             }
diff --git a/src/federated_user/fed_user_resource.py b/src/federated_user/fed_user_resource.py
new file mode 100644
index 00000000..3d9871df
--- /dev/null
+++ b/src/federated_user/fed_user_resource.py
@@ -0,0 +1,141 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import boto3
+import logging
+import os
+from prometheus_client import CollectorRegistry, Gauge, push_to_gateway
+from datetime import date, datetime, timedelta
+import botocore
+import traceback
+
+case_list = []
+regionName = os.environ["AWS_REGION"]
+try:
+    client = boto3.client("ce")
+    s3 = boto3.client("s3")
+except Exception as e:
+    logging.error("Error creating boto3 client: " + str(e))
+try:
+    ssm_client = boto3.client("ssm")
+except Exception as e:
+    logging.error("Error creating boto3 client for ssm:" + str(e))
+
+
+def cost_of_instance(event, client, resource_id):
+    """
+    Return cost of resource from last 14 days
+
+    Args:
+        Resource ID: Resource ID.
+        Client: Cost Explorer boto3 client
+    Returns:
+        It return cost of resource from last 14 days
+    Raises:
+        KeyError: Error if Cost Explorer API call doesn't execute.
+    """
+    cost_by_days = 1
+    end_date = str(date.today())
+    start_date = str(date.today() - timedelta(days=cost_by_days))
+    ce_response = client.get_cost_and_usage_with_resources(
+        TimePeriod={"Start": start_date, "End": end_date},
+        Granularity="DAILY",
+        Filter={
+            "Dimensions": {
+                "Key": "RESOURCE_ID",
+                "Values": [resource_id],
+            }
+        },
+        Metrics=["UnblendedCost"],
+    )
+    total_amount = sum(float(item["Total"]["UnblendedCost"]["Amount"]) for item in ce_response["ResultsByTime"])
+    return total_amount
+
+def lambda_handler(event, context):
+    """
+    List resources under ownership of specific IAM User.
+    Args:
+        IAM Users List: IAM Users.
+    Returns:
+        It return list of resources under ownership of specific IAM user in aws .
+    Raises:
+        KeyError: Raise error if cost explorer api  call not execute.
+    """
+    try:
+        current_date = datetime.now()
+        year = str(current_date.year)
+        month = current_date.strftime('%m')
+        day = current_date.strftime('%d')
+        bucket_name = os.environ['bucket_name']
+        
+        # Set the destination key
+        destination_key = f"fed-resources/{year}/{month}/{day}/duplicated.json"
+    
+        data = s3.get_object(Bucket=event["Records"][0]["s3"]["bucket"]["name"], Key=event["Records"][0]["s3"]["object"]["key"])
+        file_content = json.loads(data['Body'].read().decode('utf-8'))
+        ec2_instances = []
+        
+        registry = CollectorRegistry()
+#         # Creating gauge metrics for resource's cost for specific IAM User
+        gauge = Gauge(
+            "FED_USER_Resource_Cost_List",
+            "FED USER Resource List And Cost",
+            labelnames=[
+                "resource_id",
+                "resource",
+                "cost",
+                "account_id",
+                'region',
+                'resource_name',
+                'month'
+            ],
+            registry=registry,
+        )
+        
+        for account_id, resources in file_content['body'].items():
+            account = account_id
+            for v in resources['compliant']:
+                for name,arn in v.items():
+                    resource_id = arn
+                    resource_type = resource_id.split(':')[2]
+        #     for resource in resources:
+        #         if resource['Compliance']:
+        #             resource_id = resource['ResourceARN']
+                    resource_type = resource_id.split(':')[2]
+                    resource_name = name
+                    if resource_id.startswith('arn:aws:s3'):
+                        region = ''
+                    else:
+                        region = resource_id.split(':')[3]
+                    cost = cost_of_instance(event, client, resource_id)
+                    current_month_name = datetime.now().strftime("%B")
+                    month = (datetime.now() - timedelta(days=datetime.now().day - 1)).strftime("%B") if datetime.now().day == 1 else current_month_name
+                    ec2_instances.append({'resource_id': resource_id, 'cost': cost, 'region': region, 'resource': resource_type, 'resource_name': resource_name, 'account_id': account})
+                    gauge.labels(
+                        resource_id, resource_type, cost, account_id, region, resource_name, month
+                    ).set(cost)
+                    push_to_gateway(
+                    os.environ["prometheus_ip"],
+                        job="FED_USER_Resource_Cost_List",
+                        registry=registry,
+                    )
+                    
+                    
+        #         # elif resource['ResourceARN'].startswith('arn:aws:lambda'):
+                    
+    except Exception as f:
+        print(str(traceback.format_exc()))
+   
+    return {"statusCode": 200}
\ No newline at end of file
diff --git a/src/federated_user/list_fed_user.py b/src/federated_user/list_fed_user.py
new file mode 100644
index 00000000..0491ded6
--- /dev/null
+++ b/src/federated_user/list_fed_user.py
@@ -0,0 +1,207 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+import io
+import gzip
+import json
+import boto3
+import botocore
+import os
+import logging
+from prometheus_client import CollectorRegistry, Gauge, push_to_gateway
+from urllib.parse import unquote_plus
+from datetime import datetime, timedelta
+import time
+
+#Needed to invoke Untagged Resource Lambda
+untagged_resource_lambda_arn = os.environ['UNTAGGED_RESOURCE_LAMBDA_ARN']
+lambda_client = boto3.client('lambda')
+try:
+    s3 = boto3.client("s3")
+    bucket_name = os.environ["bucket_name"]
+except Exception as e:
+    logging.error("Error creating boto3 client: " + str(e))
+try:
+    sns = boto3.client("sns")
+except Exception as e:
+    logging.error("Error creating boto3 client: " + str(e))
+
+# Initializing environment variables
+runtime_region = 'ap-southeast-2' #os.environ["REGION"]
+# topic_arn = os.environ["sns_topic"]
+
+def lookup_events(next_token=None, attribute=None):
+    cloud_trail_client = boto3.client('cloudtrail')
+    # log = []
+    if next_token:
+        response = cloud_trail_client.lookup_events(
+            LookupAttributes=[
+                {
+                    'AttributeKey': 'EventName',
+                    'AttributeValue': attribute
+                },
+            ],
+            StartTime=datetime.now() - timedelta(days=1),
+            EndTime=datetime.now(),
+            NextToken=next_token
+        )
+    else:
+        response = cloud_trail_client.lookup_events(
+            LookupAttributes=[
+                {
+                    'AttributeKey': 'EventName',
+                    'AttributeValue': attribute
+                },
+            ],
+            StartTime=datetime.now() - timedelta(days=1),
+            EndTime=datetime.now()
+        )
+    
+    return response 
+
+    
+    # for event in lookupevents:
+    
+def verify_tags(tags):
+    required_tags = ['Owner','Creator', 'Project']
+    if all(tag in tags for tag in required_tags):
+        return True
+    else:
+        return False
+
+def get_resources_with_tags():
+    # Initialize the Resource Groups Tagging API client
+    client = boto3.client('resourcegroupstaggingapi')
+    
+    # Retrieve resources with the specified account ID
+    paginator = client.get_paginator('get_resources')
+    resources = []
+    
+    try:
+        # Paginate through the list of resources
+        for page in paginator.paginate(ResourceTypeFilters=['s3', 'lambda', 'ec2:instance']):
+            for resource in page.get('ResourceTagMappingList', []):
+                resource_arn = resource['ResourceARN']
+                tags = {tag['Key']: tag['Value'] for tag in resource.get('Tags', [])}
+                if tags:
+                    resources.append({'ResourceARN': resource_arn, 'Tags': tags, 'Compliance': verify_tags(tags)})
+                else:
+                    resources.append({'ResourceARN': resource_arn, 'Tags': tags})
+        
+    except Exception as e:
+        print(f"Error retrieving resources: {str(e)}")
+    
+    return resources
+
+def lambda_handler(event, context):
+    # Initialize IAM client
+    iam = boto3.client('iam')
+    response = iam.list_roles()
+    account_ids = set()
+    # Process the response
+    for role in response.get('Roles', []):
+        assume_role_policy_document = role.get('AssumeRolePolicyDocument', {})
+        principal = assume_role_policy_document.get('Statement', [{}])[0].get('Principal', {})
+        federated_value = principal.get('Federated')
+        if federated_value:
+            # Extract the account ID from the federated ARN
+            account_id = federated_value.split(':')[4]
+            account_ids.add(account_id)
+    accounts = list(account_ids)
+    usernames = []
+    response = iam.list_users()
+    for account in account_ids:
+        for user in response.get('Users'):
+            if account in user.get('Arn').split(":")[4]:
+                usernames.append(user.get('UserName'))
+    resources_from_trail = []
+    attributes = ['RunInstances', 'CreateFunction20150331', 'CreateBucket']
+    for attribute in attributes:
+        response = lookup_events(attribute=attribute)
+        for event in response['Events']:
+            for x in event['Resources']:
+                if attribute == 'RunInstances' and x['ResourceType'] != 'AWS::EC2::Instance':
+                    continue
+                resources_from_trail.append({event['Username']:x['ResourceName']})
+        while 'NextToken' in response:
+            response = lookup_events(next_token=response.get('NextToken'), attribute=attribute)
+            for event in response['Events']:
+                for x in event['Resources']:
+                    resources_from_trail.append({event['Username']:x['ResourceName']})
+                    
+    resources_by_user = {}
+
+    for entry in resources_from_trail:
+        for username, resource in entry.items():
+            if username not in resources_by_user:
+                resources_by_user[username] = set()
+            resources_by_user[username].add(resource)
+            
+    tagging_resource = get_resources_with_tags()
+    # Initialize combined dictionary
+    combined_resources = {}
+    # Iterate over resources from trail
+    for username, resources in resources_by_user.items():
+        combined_resources[username] = {'compliant': [], 'non-compliant': [], 'untagged': []}
+        for x in resources:
+            flag = False
+            for data in tagging_resource:
+                if 'Compliance' not in data:
+                    continue
+                if (x in data['ResourceARN'].split(":") or x in data['ResourceARN'].split("/")) and data.get('Compliance'):
+                    combined_resources[username]['compliant'].append({x:data['ResourceARN']})
+                    flag=True
+                elif (x in data['ResourceARN'].split(":") or x in data['ResourceARN'].split("/")) and not data.get('Compliance'):
+                    combined_resources[username]['non-compliant'].append({x:data['ResourceARN']})
+                    flag=True
+            if not flag:
+                combined_resources[username]['untagged'].append(x)
+    
+    # print(combined_resources)
+
+    current_date = datetime.now()
+    year = str(current_date.year)
+    month = current_date.strftime('%m')
+    day = current_date.strftime('%d')
+
+    # Set the destination key
+    destination_key = f"fed-resources/{year}/{month}/{day}/resources.json"
+    try:
+        s3.put_object(Bucket=bucket_name, Key=destination_key, Body=json.dumps({'body':combined_resources}))
+
+        invoke_response = lambda_client.invoke(
+            FunctionName=untagged_resource_lambda_arn,
+            InvocationType='Event'
+        )
+    #     # Check the response from untagged resource
+    #     if invoke_response['StatusCode'] == 202:
+    #         print("Untagged Resource invoked successfully")
+    #         print(response)
+    #     else:
+    #         print("Error invoking Untagged resource")
+    except botocore.exceptions.ClientError as e:
+        if e.response["Error"]["Code"] == "NoSuchBucket":
+            raise ValueError(f"Bucket not found: {os.environ['bucket_name']}")
+        elif e.response["Error"]["Code"] == "AccessDenied":
+            raise ValueError(
+                f"Access denied to S3 bucket: {os.environ['bucket_name']}"
+            )
+        else:
+            raise ValueError(f"Failed to upload data to S3 bucket: {str(e)}")
+    # print(resources_from_trail) 
+    # print(resources_by_user)
+    return {
+        'statusCode': 200
+    }
\ No newline at end of file
diff --git a/src/federated_user/resource_notification.py b/src/federated_user/resource_notification.py
new file mode 100644
index 00000000..ea8a69c5
--- /dev/null
+++ b/src/federated_user/resource_notification.py
@@ -0,0 +1,114 @@
+import json
+import boto3
+import os
+from datetime import datetime
+import urllib3
+
+sns_topic_arn = os.environ['SNS_TOPIC_ARN']  # Retrieve SNS topic ARN from environment variable
+namespace = os.environ['NAME_SPACE']
+http = urllib3.PoolManager()  # Creating an HTTP connection pool manager
+
+s3 = boto3.client('s3')
+
+def get_resources_from_s3():
+    # Current Date and time to access file in S3 bucket
+    current_date = datetime.now()
+    year = str(current_date.year)
+    month = current_date.strftime('%m')
+    day = current_date.strftime('%d')
+    
+    # Retrieve the file from S3
+    bucket_name = (f"{namespace}-metadata-storage")
+    file_key = f"fed-resources/{year}/{month}/{day}/resources.json"
+    
+    try:
+        # Retrieve the file from S3
+        response = s3.get_object(Bucket=bucket_name, Key=file_key)
+        data = response['Body'].read().decode('utf-8')
+        
+        # Parse the JSON data
+        json_data = json.loads(data)
+        metadata = json_data['body']
+        
+        untagged_resources = []
+        non_compliant_resources = []
+        
+        # Iterate over each user in metadata
+        for user, resources in metadata.items():
+            # Extract non-compliant resources
+            non_compliant = resources.get('non-compliant', [])
+            for item in non_compliant:
+                non_compliant_resources.append(item)
+            
+            # Extract untagged resources
+            untagged = resources.get('untagged', [])
+            for item in untagged:
+                untagged_resources.append(item)
+        
+        # return {
+        #     "non_compliant_resources": non_compliant_resources,
+        #     "untagged_resources": untagged_resources
+        # }
+        
+        print(non_compliant_resources)
+        print(untagged_resources)
+        return non_compliant_resources, untagged_resources
+    
+    except s3.exceptions.NoSuchKey:
+        return {
+            "errorMessage": "The specified key does not exist in the S3 bucket."
+        }
+    
+    except Exception as e:
+        return {
+            "errorMessage": str(e)
+        }
+
+def send_notification(non_compliant_resources, untagged_resources):
+    url = os.environ["SLACK_WEBHOOK_URL"]  # Slack webhook URL
+    # Prepare message
+    message = "Dear Team and Administrator,\n\n"+ "I hope this message finds you well. I wanted to bring to your attention a list of untagged resources and the resources that does not have proper tags for proper cost allocation.\n"+ "Below is the list of resources found without proper tags for cost allocation.\n\n\n"
+
+    for index in range(len(untagged_resources)):
+        message += f"{index + 1}. {untagged_resources[index]}\n\n"
+
+    #Show this message only if there are resource with tags that are not appropriate for cost allocation
+    if non_compliant_resources:
+        message += "\nFollowing are the resources without proper tags for cost allocation:\n"
+
+        for index in range(len(non_compliant_resources)):
+            message += f"{index + 1}. {non_compliant_resources[index]}\n\n"
+
+    message += "\n\nYour assistance in reviewing these resources and assigning appropriate tags to them would be greatly appreciated.\n"+ "Thank you for your attention to this matter.\n\nBest Regards"
+
+    # Publish message to SNS topic
+    response = sns.publish(
+        TopicArn=sns_topic_arn,  # Use dynamically retrieved SNS topic ARN 
+        Message=message,
+        Subject='Regarding Untagged Resources',
+    )
+
+    # Sending Message to Slack Channel
+    msg = {
+        "channel": "#untagged-resources",  # Slack channel where the message will be posted 
+        "text": message,  # Message content obtained from SNS event
+    }
+
+    # Encode message as JSON
+    encoded_msg = json.dumps(msg).encode("utf-8")
+    
+    # Send HTTP POST request to Slack webhook URL
+    resp = http.request("POST", url, body=encoded_msg)
+
+    # Print response details
+    print(
+        {
+            "message": message,  # Original SNS message
+            "status_code": resp.status,  # HTTP status code of the response
+            "response": resp.data,       # Response data
+        }
+    )
+    
+def lambda_handler(event, context):
+    non_compliant_resources, untagged_resources = get_resources_from_s3()
+    send_notification(non_compliant_resources, untagged_resources)
diff --git a/tests/unit_test/README.md b/tests/unit_test/README.md
new file mode 100644
index 00000000..228dee01
--- /dev/null
+++ b/tests/unit_test/README.md
@@ -0,0 +1,64 @@
+## Introduction
+
+For XC3 we are using pytest for testing, and we have provisioned our infrastructure using Terraform. Additionally, we are using the Boto3 client library to interact with AWS services programmatically.
+
+In the following sections, we will explore how to use these tools to test our application effectively and efficiently. We will cover topics such as defining test cases, running tests, and analyzing test results. We will also discuss leveraging Terraform to create and manage the test environment and how Boto3 can help us interact with AWS services during testing.
+
+By the end of this guide, you should understand how to use pytest, Terraform, Boto3 and mock to test your application, and how these tools can help you achieve better software quality and reliability.
+
+## How will the tests be run?
+
+Tests will be run frequently throughout the development cycle, including during the build and deployment stages. It's a good practice to run tests after each code change and before each deployment to ensure that the changes don't introduce any new bugs or regressions. We have automated this process using GitHub Actions, which allows us to set up a workflow that automatically tests our code whenever changes are pushed to the repository. With GitHub Actions, you can define custom workflows in YAML files that specify the steps to run and the conditions under which they should be run. In our case, we have defined a workflow that runs the pytest command to execute the test suite whenever changes are pushed to the repository. The results of the test run are available in the GitHub Actions console, where developers can view logs and other diagnostic information.
+
+## How to run tests locally?
+First, clone the repository [XC3](https://github.com/XgridInc/xc3.git)
+and follow the [installation guide](https://docs.google.com/document/d/1YoaWoDSOjdOY2Wk3FXYHOni4wERCU7_WvsQamYkqS_o/edit) until you reach the 'terraform init' step within the 'XC3/infrastructure' directory. Once you've completed those initial steps, navigate to the 'XC3/test/unittests' directory.
+
+Run following command. 
+```
+python3 -m venv venv
+source venv/bin/activate
+pip3 install -r requirements.txt
+```
+First run any test available to check all things are fine using this command.
+```
+pytest -v "filename.py"
+```
+This will show test failed/passed. if passed. 
+then now you can create new unit test file and test them by running same command 
+```
+pytest -v "fileName.py"
+```
+
+## Work Flow
+
+1. Code changes are pushed to the repository.
+2. GitHub Actions detects the changes and triggers the workflow.
+3. The workflow checks out the latest version of the code from the repository.
+4. GitHub Actions provisions a runner and installs the necessary dependencies for the project.
+5. The runner runs the pytest command to execute the test suite.
+6. If any tests fail, the workflow is halted, and a notification is sent to the developers.
+7. If all tests pass, the workflow moves on to the next stage, such as deploying the code to the production environment.
+8. The results of the test run are available in the GitHub Actions console, where developers can view logs and other diagnostic information.
+
+## Testing Work Flow
+
+
+![image](https://user-images.githubusercontent.com/105271892/234582908-831eb98c-8257-4bc7-8b51-a8a1b040b4b3.png)
+
+## Github Actions Workflow Overview
+
+![image](https://github.com/X-CBG/XC3/assets/122358742/ff37c233-7961-40ef-9759-bc642651ae22)
+
+Here is a possible flow for the case where the tests fail and the changes need to be fixed before the PR can be approved and merged:
+
+1. Create PR: The developer creates a new pull request in GitHub with their changes.
+2. GitHub Action runs: When the PR is created, the GitHub Action is triggered automatically.
+3. Run unit tests: The GitHub Action runs the unit tests defined in the project to verify the changes made in the PR.
+4. Test failure: If the tests fail, the GitHub Action reports the failure and the PR is marked as failing the tests.
+5. Fix the code: The developer needs to fix the code to make the tests pass.
+6. Commit changes: Once the code is fixed, the developer commits the changes to the same branch used for the original PR.
+7. GitHub Action runs again: As soon as the changes are committed, the GitHub Action is triggered again automatically.
+8. Rerun unit tests: The GitHub Action runs the unit tests again to verify the changes made in the commit.
+9. Test success: If the tests pass, the PR is marked as passing the tests and can be reviewed again.
+10. Review: The code changes are reviewed by the team, and if approved, the PR is merged into the main branch.
diff --git a/tests/unit_test/config.py b/tests/unit_test/config.py
index 7988845d..ae73e37f 100644
--- a/tests/unit_test/config.py
+++ b/tests/unit_test/config.py
@@ -42,19 +42,278 @@
 project_spend_cost = "project_spend_cost"
 resource_list = "resource_list"
 
-
-# Env
-env = terraform_plan_json["variables"]["env"]["value"]
-os.environ["ENV"] = env
-os.system("export ENV")
-
-
 combined_list = []
 for item in terraform_plan_json["planned_values"]["root_module"][
     "child_modules"
 ]:  # noqa: E501
     combined_list.extend(item["resources"])
 
+kms_id = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_cloudtrail" and data_item["name"] == "this":
+        kms_id = data_item["values"]["kms_key_id"].split("/")[-1]
+        break
+
+s3_bucket = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_s3_bucket"
+        and data_item["name"] == "this"
+        and data_item["address"] == "module.xc3.aws_s3_bucket.this"
+    ):
+        s3_bucket = data_item["values"]["bucket"]
+        break
+
+s3_bucket_tags = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_s3_bucket" and data_item["name"] == "this":
+        s3_bucket_tags = data_item["values"]["tags"]
+        break
+
+vpc_cidr = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_vpc" and data_item["name"] == "this":
+        vpc_cidr = data_item["values"]["cidr_block"]
+        break
+
+vpc_public_subnet = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_subnet" and data_item["name"] == "public_subnet":
+        vpc_public_subnet = data_item["values"]["cidr_block"]
+        break
+
+vpc_private_subnet = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_subnet" and data_item["name"] == "private_subnet":
+        vpc_private_subnet = data_item["values"]["cidr_block"]
+        break
+
+cognito = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cognito_user_pool"
+        and data_item["address"] == "module.xc3.aws_cognito_user_pool.grafana_pool[0]"
+    ):
+        cognito = data_item["values"]["name"]
+        break
+
+cloudwatch_list_linked_account = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == list_linked_accounts
+    ):
+        cloudwatch_list_linked_account = data_item["values"]["name"]
+        break
+
+cloudwatch_list_linked_account_description = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == list_linked_accounts
+    ):
+        cloudwatch_list_linked_account_description = data_item["values"]["description"]
+        break
+
+cloudwatch_list_linked_account_cron = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == list_linked_accounts
+    ):
+        cloudwatch_list_linked_account_cron = data_item["values"]["schedule_expression"]
+        break
+
+cloudwatch_most_expensive_services = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == most_expensive_service
+    ):
+        cloudwatch_most_expensive_services = data_item["values"]["name"]
+        break
+
+cloudwatch_most_expensive_services_description = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == most_expensive_service
+    ):
+        cloudwatch_most_expensive_services_description = data_item["values"][
+            "description"
+        ]
+        break
+
+cloudwatch_most_expensive_services_cron = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == most_expensive_service
+    ):
+        cloudwatch_most_expensive_services_cron = data_item["values"][
+            "schedule_expression"
+        ]
+        break
+
+cloudwatch_project_spend_cost = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == project_spend_cost
+    ):
+        cloudwatch_project_spend_cost = data_item["values"]["name"]
+        break
+
+cloudwatch_project_spend_cost_description = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == project_spend_cost
+    ):
+        cloudwatch_project_spend_cost_description = data_item["values"]["description"]
+        break
+
+cloudwatch_project_spend_cost_cron = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == project_spend_cost
+    ):
+        cloudwatch_project_spend_cost_cron = data_item["values"]["schedule_expression"]
+        break
+
+cloudwatch_resource_list = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == resource_list
+    ):
+        cloudwatch_resource_list = data_item["values"]["name"]
+        break
+
+cloudwatch_resource_list_description = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == resource_list
+    ):
+        cloudwatch_resource_list_description = data_item["values"]["description"]
+        break
+
+cloudwatch_resource_list_cron = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_cloudwatch_event_rule"
+        and data_item["name"] == resource_list
+    ):
+        cloudwatch_resource_list_cron = data_item["values"]["schedule_expression"]
+        break
+
+ec2_ami = None
+ec2_ami_count = 0
+for data_item in combined_list:
+    if data_item["type"] == "aws_instance" and data_item["name"] == "this":
+        ec2_ami = data_item["values"]["ami"]
+        ec2_ami_count += 1
+        break
+
+ec2_az = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_subnet" and data_item["name"] == "public_subnet":
+        ec2_ami = data_item["values"]["availability_zone"]
+        break
+
+iam_role_project_spend_cost_name = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_iam_role" and data_item["name"] == "ProjectSpendCost":
+        iam_role_project_spend_cost_name = data_item["values"]["name"]
+        break
+
+iam_role_project_spend_cost_assumed_policy = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_iam_role" and data_item["name"] == "ProjectSpendCost":
+        iam_role_project_spend_cost_assumed_policy = data_item["values"][
+            "assume_role_policy"
+        ]
+        break
+
+iam_role_resource_list_name = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == "resource_list_service_role"
+    ):
+        iam_role_resource_list_name = data_item["values"]["name"]
+        break
+
+iam_role_resource_list_assumed_policy = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == "resource_list_service_role"
+    ):
+        iam_role_resource_list_assumed_policy = data_item["values"][
+            "assume_role_policy"
+        ]
+        break
+
+iam_role_total_account_cost_name = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_iam_role" and data_item["name"] == total_account_cost:
+        iam_role_total_account_cost_name = data_item["values"]["name"]
+        break
+
+iam_role_total_account_cost_assumed_policy = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_iam_role" and data_item["name"] == total_account_cost:
+        iam_role_total_account_cost_assumed_policy = data_item["values"][
+            "assume_role_policy"
+        ]
+        break
+
+iam_role_most_expensive_service_role_name = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == "most_expensive_service_role"
+    ):
+        iam_role_most_expensive_service_role_name = data_item["values"]["name"]
+        break
+
+mes_role_assumed_policy = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == "most_expensive_service_role"
+    ):
+        mes_role_assumed_policy = data_item["values"]["assume_role_policy"]
+        break
+
+iam_role_list_linked_accounts_name = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == list_linked_accounts
+    ):
+        iam_role_list_linked_accounts_name = data_item["values"]["name"]
+        break
+
+iam_role_list_linked_accounts_assumed_policy = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_iam_role"
+        and data_item["name"] == list_linked_accounts
+    ):
+        iam_role_list_linked_accounts_assumed_policy = data_item["values"][
+            "assume_role_policy"
+        ]
+        break
+
+# Env
+env = terraform_plan_json["variables"]["env"]["value"]
+os.environ["ENV"] = env
+os.system("export ENV")
+
 # Region
 region = terraform_plan_json["variables"]["region"]["value"]
 
@@ -73,3 +332,23 @@
     if data_item["type"] == "apigw" and data_item["name"] == "this":
         api_gateway = data_item["values"]["name"]
         break
+# SQS
+sqs_name = None
+for data_item in combined_list:
+    if data_item["type"] == "aws_sqs_queue" and data_item["name"] == "this":
+        sqs_name = data_item["values"]["name"]
+        break
+# EIC endpoint
+ec2_instance_connect_endpoint = None
+for data_item in combined_list:
+    if (
+        data_item["type"] == "aws_ec2_instance_connect_endpoint"
+        and data_item["name"] == "eicendpoint"
+    ):
+        ec2_instance_connect_endpoint = data_item["instances"]["arn"]
+        break
+# AWS Lambda fucntions
+lambda_function_names = []
+for data_item in combined_list:
+    if data_item["type"] == "aws_lambda_function":
+        lambda_function_names.append(data_item["name"])
diff --git a/tests/unit_test/requirements.txt b/tests/unit_test/requirements.txt
new file mode 100644
index 00000000..da1aa6ff
--- /dev/null
+++ b/tests/unit_test/requirements.txt
@@ -0,0 +1,31 @@
+boto3==1.28.7 
+botocore==1.31.7
+certifi==2023.7.22
+cffi==1.15.1
+charset-normalizer==3.2.0
+cryptography==41.0.6
+ecdsa==0.18.0
+idna==3.4
+iniconfig==2.0.0
+Jinja2==3.1.3
+jmespath==1.0.1
+MarkupSafe==2.1.3
+moto==4.1.13
+packaging==23.1
+pluggy==1.2.0
+pyasn1==0.5.0
+pycparser==2.21
+pytest==7.4.0
+python-dateutil==2.8.2
+python-dotenv==1.0.0
+python-jose==3.3.0
+PyYAML==6.0.1
+requests==2.31.0
+responses==0.23.1
+rsa==4.9
+s3transfer==0.6.1
+six==1.16.0
+types-PyYAML==6.0.12.10
+urllib3==1.26.18
+Werkzeug==2.3.6
+xmltodict==0.13.0
\ No newline at end of file
diff --git a/tests/unit_test/unit-test-ce.py b/tests/unit_test/unit-test-ce.py
new file mode 100644
index 00000000..7b061db0
--- /dev/null
+++ b/tests/unit_test/unit-test-ce.py
@@ -0,0 +1,99 @@
+"""
+Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+SPDX-License-Identifier: Apache-2.0
+"""
+import unittest
+import boto3
+from unittest.mock import patch, MagicMock
+from config import region
+
+def function_to_get_cost_and_usage():
+    """
+    This function retrieves cost and usage information from AWS Cost Explorer for Amazon S3 services.
+
+    Returns:
+        dict: A dictionary containing the total cost and currency, or None if no results are available.
+    """
+    ce_client = boto3.client('ce', region_name=region)  
+
+    start_date = '2023-01-01'
+    end_date = '2023-01-31'
+    granularity = 'DAILY'
+    metrics = ['UnblendedCost']
+    
+    filters = {
+        'Dimensions': {
+            'Key': 'SERVICE',
+            'Values': ['Amazon S3']
+        }
+    }
+
+    response = ce_client.get_cost_and_usage(
+        TimePeriod={
+            'Start': start_date,
+            'End': end_date
+        },
+        Granularity=granularity,
+        Metrics=metrics,
+        Filter=filters
+    )
+
+    results = response['ResultsByTime']
+    if results:
+        total_cost = results[0]['Total']['UnblendedCost']['Amount']
+        currency = results[0]['Total']['UnblendedCost']['Unit']
+        
+        return {'Total': float(total_cost), 'Currency': currency}
+    else:
+        return None
+
+class TestCostExplorer(unittest.TestCase):
+    """
+    This class contains test cases for the `function_to_get_cost_and_usage` function.
+    """
+    @patch('boto3.client')
+    def test_get_cost_and_usage(self, mock_boto3):
+        """
+        Test the `function_to_get_cost_and_usage` function with mock data.
+
+        The function should return the expected cost and currency information.
+        """
+        # Mock the Boto3 client
+        ce_mock = MagicMock()
+        mock_boto3.return_value = ce_mock
+
+        # Define the expected result
+        expected_result = {'Total': 100.0, 'Currency': 'USD'}
+
+        # Configure the mock's return value
+        ce_mock.get_cost_and_usage.return_value = {
+            'ResultsByTime': [
+                {
+                    'Total': {
+                        'UnblendedCost': {'Amount': '100.0', 'Unit': 'USD'},
+                    }
+                }
+            ]
+        }
+
+        # Call the function you want to test
+        result = function_to_get_cost_and_usage()
+
+        # Assert that the result matches the expected value
+        self.assertEqual(result, expected_result)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/unit_test/unit-test-cognito.py b/tests/unit_test/unit-test-cognito.py
new file mode 100644
index 00000000..79133008
--- /dev/null
+++ b/tests/unit_test/unit-test-cognito.py
@@ -0,0 +1,101 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import random
+import string
+import unittest
+
+import boto3
+from config import cognito, region
+from moto import mock_cognitoidp
+
+
+class CognitoMockTests(unittest.TestCase):
+    @mock_cognitoidp
+    def test_create_user_and_verify_attributes(self):
+        region_name = region
+
+        # Create a user pool
+        user_pool_name = cognito
+        user_pool_id = self.create_user_pool(user_pool_name, region_name)
+
+        # Create a user
+        username = "".join(
+            random.choice(string.ascii_lowercase + string.digits) for _ in range(8)
+        )
+        email = (
+            "".join(
+                random.choice(string.ascii_lowercase + string.digits) for _ in range(8)
+            )
+            + "@example.com"
+        )
+        temporary_password = "".join(
+            random.choice(string.ascii_letters + string.digits + string.punctuation)
+            for _ in range(10)
+        )
+        self.create_user(user_pool_id, username, temporary_password, email)
+
+        # Verify user attributes
+        email_verified = self.get_user_attributes(user_pool_id, username)
+        logging.info("Verified Email: %s", email_verified)
+
+        # Assert the user attributes
+        self.assertTrue(email_verified)
+
+    def create_user_pool(self, user_pool_name, region_name):
+        cognito_client = boto3.client("cognito-idp", region_name=region_name)
+        user_pool_response = cognito_client.create_user_pool(
+            PoolName=user_pool_name,
+            Policies={
+                "PasswordPolicy": {
+                    "MinimumLength": 8,
+                    "RequireLowercase": False,
+                    "RequireNumbers": False,
+                    "RequireSymbols": False,
+                    "RequireUppercase": False,
+                }
+            },
+            AutoVerifiedAttributes=["email"],
+        )
+        return user_pool_response["UserPool"]["Id"]
+
+    def create_user(self, user_pool_id, username, temporary_password, email):
+        cognito_client = boto3.client("cognito-idp", region_name=region)
+        cognito_client.admin_create_user(
+            UserPoolId=user_pool_id,
+            Username=username,
+            TemporaryPassword=temporary_password,
+            UserAttributes=[
+                {"Name": "email", "Value": email},
+            ],
+        )
+
+    def get_user_attributes(self, user_pool_id, username):
+        cognito_client = boto3.client("cognito-idp", region_name=region)
+        user_response = cognito_client.admin_get_user(
+            UserPoolId=user_pool_id, Username=username
+        )
+        user_attributes = user_response["UserAttributes"]
+        email_verified = False
+
+        for attribute in user_attributes:
+            if attribute["Name"] == "email":
+                email_verified = True
+
+        return email_verified
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-cwe.py b/tests/unit_test/unit-test-cwe.py
new file mode 100644
index 00000000..d5625016
--- /dev/null
+++ b/tests/unit_test/unit-test-cwe.py
@@ -0,0 +1,94 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import unittest
+
+import boto3
+from config import (
+    cloudwatch_list_linked_account,
+    cloudwatch_list_linked_account_cron,
+    cloudwatch_list_linked_account_description,
+    cloudwatch_most_expensive_services,
+    cloudwatch_most_expensive_services_cron,
+    cloudwatch_most_expensive_services_description,
+    cloudwatch_project_spend_cost,
+    cloudwatch_project_spend_cost_cron,
+    cloudwatch_project_spend_cost_description,
+    cloudwatch_resource_list,
+    cloudwatch_resource_list_cron,
+    cloudwatch_resource_list_description,
+    region,
+)
+from moto import mock_events
+
+try:
+    events_client = boto3.client("events", region_name=region)
+except Exception as e:
+    logging.error("Error creating events client: " + str(e))
+
+
+class CloudWatchEventMockTests(unittest.TestCase):
+    @mock_events
+    def test_create_cloudwatch_events(self):
+        # Create a CloudWatch Event rule
+        rule_data = [
+            {
+                "name": cloudwatch_list_linked_account,
+                "description": cloudwatch_list_linked_account_description,
+                "cron_expression": cloudwatch_list_linked_account_cron,
+            },
+            {
+                "name": cloudwatch_most_expensive_services,
+                "description": cloudwatch_most_expensive_services_description,
+                "cron_expression": cloudwatch_most_expensive_services_cron,
+            },
+            {
+                "name": cloudwatch_project_spend_cost,
+                "description": cloudwatch_project_spend_cost_description,
+                "cron_expression": cloudwatch_project_spend_cost_cron,
+            },
+            {
+                "name": cloudwatch_resource_list,
+                "description": cloudwatch_resource_list_description,
+                "cron_expression": cloudwatch_resource_list_cron,
+            },
+        ]
+
+        for rule in rule_data:
+            rule_name = rule["name"]
+            rule_description = rule["description"]
+            rule_schedule_expression = rule["cron_expression"]
+            response = events_client.put_rule(
+                Name=rule_name,
+                ScheduleExpression=rule_schedule_expression,
+                State="ENABLED",
+                Description=rule_description,
+            )
+
+            # Verify the rule was created
+            self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+            # Describe the CloudWatch Event rule
+            response = events_client.describe_rule(Name=rule_name)
+
+            # Verify the rule attributes
+            self.assertEqual(response["Name"], rule_name)
+            self.assertEqual(response["State"], "ENABLED")
+            self.assertEqual(response["Description"], rule_description)
+            self.assertEqual(response["ScheduleExpression"], rule_schedule_expression)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-ec2.py b/tests/unit_test/unit-test-ec2.py
new file mode 100644
index 00000000..703295ef
--- /dev/null
+++ b/tests/unit_test/unit-test-ec2.py
@@ -0,0 +1,112 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import re
+import unittest
+
+import boto3
+import pytest
+from botocore.exceptions import ClientError
+from config import ec2_ami, ec2_ami_count, ec2_az, region
+from moto import mock_ec2, settings
+
+
+class EC2Test(unittest.TestCase):
+    def setUp(self):
+        try:
+            self.client = boto3.client("ec2", region_name=region)
+        except Exception as e:
+            logging.error("Error creating EC2 client: " + str(e))
+
+    @mock_ec2
+    def test_instance_launch_and_terminate(self):
+
+        with pytest.raises(ClientError) as ex:
+            self.client.run_instances(
+                ImageId=ec2_ami, MinCount=1, MaxCount=ec2_ami_count, DryRun=True
+            )
+        ex.value.response["ResponseMetadata"]["HTTPStatusCode"] == 412
+        ex.value.response["Error"]["Code"] == "DryRunOperation"
+        ex.value.response["Error"][
+            "Message"
+        ] == """An error occurred (DryRunOperation)
+        when calling the RunInstances operation:
+        Request would have succeeded, but DryRun flag is set"""
+
+        reservation = self.client.run_instances(
+            ImageId=ec2_ami, MinCount=1, MaxCount=ec2_ami_count
+        )
+        len(reservation["Instances"]) == ec2_ami_count
+        instance = reservation["Instances"][0]
+        instance["State"] == {"Code": 0, "Name": "pending"}
+        instance_id = instance["InstanceId"]
+
+        reservations = self.client.describe_instances(InstanceIds=[instance_id])[
+            "Reservations"
+        ]
+        len(reservations) == ec2_ami_count
+        reservations[0]["ReservationId"] == reservation["ReservationId"]
+        instances = reservations[0]["Instances"]
+        len(instances) == ec2_ami_count
+        instance = instances[0]
+        instance["InstanceId"] == instance_id
+        instance["State"] == {"Code": 16, "Name": "running"}
+        if settings.TEST_SERVER_MODE:
+            # Exact value can't be determined in ServerMode
+            instance.should.have.key("LaunchTime")
+        else:
+            launch_time = instance["LaunchTime"].strftime("%Y-%m-%dT%H:%M:%S.000Z")
+            logging.info("Launch Time: %s", launch_time)
+        if instance["VpcId"] is not None:
+            logging.info("EC2 in VPC")
+        instance["Placement"]["AvailabilityZone"] == ec2_az
+
+        root_device_name = instance["RootDeviceName"]
+        mapping = instance["BlockDeviceMappings"][0]
+        mapping["DeviceName"] == root_device_name
+        mapping["Ebs"]["Status"] == "in-use"
+        volume_id = mapping["Ebs"]["VolumeId"]
+        re.match(r"vol-\w+", volume_id)
+
+        volume = self.client.describe_volumes(VolumeIds=[volume_id])["Volumes"][0]
+        volume["Attachments"][0]["InstanceId"] == instance_id
+        volume["State"] == "in-use"
+
+        with pytest.raises(ClientError) as ex:
+            self.client.terminate_instances(InstanceIds=[instance_id], DryRun=True)
+        ex.value.response["ResponseMetadata"]["HTTPStatusCode"] == 412
+        ex.value.response["Error"]["Code"] == "DryRunOperation"
+        ex.value.response["Error"][
+            "Message"
+        ] == """An error occurred (DryRunOperation) when calling
+        the TerminateInstances operation:
+        Request would have succeeded, but DryRun flag is set"""
+
+        response = self.client.terminate_instances(InstanceIds=[instance_id])
+        len(response["TerminatingInstances"]) == ec2_ami_count
+        instance = response["TerminatingInstances"][0]
+        instance["InstanceId"] == instance_id
+        instance["PreviousState"] == {"Code": 16, "Name": "running"}
+        instance["CurrentState"] == {"Code": 32, "Name": "shutting-down"}
+
+        reservations = self.client.describe_instances(InstanceIds=[instance_id])[
+            "Reservations"
+        ]
+        instance = reservations[0]["Instances"][0]
+        instance["State"] == {"Code": 48, "Name": "terminated"}
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-eic.py b/tests/unit_test/unit-test-eic.py
new file mode 100644
index 00000000..e5266320
--- /dev/null
+++ b/tests/unit_test/unit-test-eic.py
@@ -0,0 +1,79 @@
+"""
+Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+SPDX-License-Identifier: Apache-2.0
+"""
+import logging
+import unittest
+
+import boto3
+from config import ec2_instance_connect_endpoint, region, env
+
+class EicMockTests(unittest.TestCase):
+    """
+    Unit tests for EC2 Instance Connect Endpoint creation.
+
+    These tests validate the existence of an EC2 Instance Connect Endpoint with the specified ARN when the environment is 'prod'.
+    """
+    # Define a decorator to skip the test if the environment is "dev"
+    def skip_if_dev(func):
+        def wrapper(self, *args, **kwargs):
+            if env != "prod":
+                self.skipTest("Skipping test in 'dev' environment")
+            else:
+                func(self, *args, **kwargs)
+
+        return wrapper
+
+    @skip_if_dev
+    def setUp(self):
+        """
+        Set up the test case by initializing the AWS EC2 client.
+        """
+        # Initialize the AWS EC2 client
+        self.ec2_client = boto3.client('ec2', region_name=region)
+
+    @skip_if_dev
+    def test_eni_endpoint_created(self):
+        """
+        Test if the EC2 Instance Connect Endpoint with the specified ARN has been created.
+
+        This test checks if the EC2 Instance Connect Endpoint exists and logs information for debugging.
+
+        Raises:
+            AssertionError: If the number of EC2 Instance Connect Endpoints with the specified ARN is not equal to 1.
+        """
+        # Log information for debugging
+        logging.info(f"Testing EC2 Instance Connect Endpoint: ARN: {ec2_instance_connect_endpoint}, Region: {region}, Environment: {env}")
+        # Check if the ENI endpoint exists
+        try:
+            # Use Boto3 to describe the network interfaces and find the one with the specified ARN
+            response = self.ec2_client.describe_network_interfaces(Filters=[{'Name': 'network-interface-id', 'Values': [ec2_instance_connect_endpoint]}])
+            network_interfaces = response['NetworkInterfaces']
+
+            if len(network_interfaces) == 1:
+                logging.info(f"EC2 Instance Connect Endpoint with ARN '{ec2_instance_connect_endpoint}' has been created.")
+            elif len(network_interfaces) == 0:
+                logging.warning(f"EC2 Instance Connect Endpoint with ARN '{ec2_instance_connect_endpoint}' not found.")
+            else:
+                logging.warning(f"Multiple EC2 Instance Connect Endpoints with the same ARN '{ec2_instance_connect_endpoint}' found.")
+
+            self.assertEqual(len(network_interfaces), 1, "Expected one EC2 Instance Connect Endpoint to be created.")
+        except Exception as e:
+            logging.warning(f"Error while checking EC2 Instance Connect Endpoint: {str(e)}")
+
+if __name__ == "__main__":
+    unittest.main()
+    logging.shutdown()  
diff --git a/tests/unit_test/unit-test-iam.py b/tests/unit_test/unit-test-iam.py
new file mode 100644
index 00000000..9406090a
--- /dev/null
+++ b/tests/unit_test/unit-test-iam.py
@@ -0,0 +1,119 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import json
+import unittest
+
+import boto3
+from config import (
+    iam_role_list_linked_accounts_assumed_policy,
+    iam_role_list_linked_accounts_name,
+    iam_role_most_expensive_service_role_name,
+    iam_role_project_spend_cost_assumed_policy,
+    iam_role_project_spend_cost_name,
+    iam_role_resource_list_assumed_policy,
+    iam_role_resource_list_name,
+    iam_role_total_account_cost_assumed_policy,
+    iam_role_total_account_cost_name,
+    mes_role_assumed_policy,
+    region,
+)
+from moto import mock_iam
+
+
+class IAMRoleMockTests(unittest.TestCase):
+    @mock_iam
+    def test_create_describe_delete_iam_roles(self):
+        iam_client = boto3.client("iam", region_name=region)
+        roles = [
+            {
+                "role_name": iam_role_project_spend_cost_name,
+                "assume_role_policy": iam_role_project_spend_cost_assumed_policy,
+            },
+            {
+                "role_name": iam_role_list_linked_accounts_name,
+                "assume_role_policy": iam_role_list_linked_accounts_assumed_policy,
+            },
+            {
+                "role_name": iam_role_total_account_cost_name,
+                "assume_role_policy": iam_role_total_account_cost_assumed_policy,
+            },
+            {
+                "role_name": iam_role_resource_list_name,
+                "assume_role_policy": iam_role_resource_list_assumed_policy,
+            },
+            {
+                "role_name": iam_role_most_expensive_service_role_name,
+                "assume_role_policy": mes_role_assumed_policy,
+            },
+        ]
+
+        for roles_data in roles:
+            # Create an IAM role
+            response = iam_client.create_role(
+                RoleName=roles_data["role_name"],
+                AssumeRolePolicyDocument=json.dumps(roles_data["assume_role_policy"]),
+            )
+            # Verify the role was created
+            self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+            # Describe the IAM role
+            response = iam_client.get_role(RoleName=roles_data["role_name"])
+            role = response["Role"]
+
+            # Verify the role attributes
+            self.assertEqual(role["RoleName"], roles_data["role_name"])
+            self.assertEqual(
+                role["AssumeRolePolicyDocument"], roles_data["assume_role_policy"]
+            )
+
+            # Delete the IAM role
+            response = iam_client.delete_role(RoleName=roles_data["role_name"])
+
+            # Verify the role was deleted
+            self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+    @mock_iam
+    def test_create_describe_delete_iam_instance_profile(self):
+        iam_client = boto3.client("iam", region_name=region)
+
+        # Create an IAM instance profile
+        instance_profile_name = "test-instance-profile"
+        response = iam_client.create_instance_profile(
+            InstanceProfileName=instance_profile_name
+        )
+
+        # Verify the instance profile was created
+        self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+        # Describe the IAM instance profile
+        response = iam_client.get_instance_profile(
+            InstanceProfileName=instance_profile_name
+        )
+        instance_profile = response["InstanceProfile"]
+
+        # Verify the instance profile attributes
+        self.assertEqual(instance_profile["InstanceProfileName"], instance_profile_name)
+
+        # Delete the IAM instance profile
+        response = iam_client.delete_instance_profile(
+            InstanceProfileName=instance_profile_name
+        )
+
+        # Verify the instance profile was deleted
+        self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-kms.py b/tests/unit_test/unit-test-kms.py
new file mode 100644
index 00000000..cb40b926
--- /dev/null
+++ b/tests/unit_test/unit-test-kms.py
@@ -0,0 +1,54 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import unittest
+
+import boto3
+from config import kms_id, region
+from moto import mock_kms
+
+try:
+    kms_client = boto3.client("kms", region_name=region)
+except Exception as e:
+    logging.error("Error creating KMS client: " + str(e))
+
+
+class KMSMockTests(unittest.TestCase):
+    @mock_kms
+    def test_encrypt_decrypt_data(self):
+
+        # Create a KMS key
+        key_alias = f"alias/{kms_id}"
+        response = kms_client.create_key()
+        key_id = response["KeyMetadata"]["KeyId"]
+        kms_client.create_alias(AliasName=key_alias, TargetKeyId=key_id)
+
+        # Encrypt data
+        plaintext = "Hello, World!"
+        encryption_response = kms_client.encrypt(
+            KeyId=key_alias, Plaintext=plaintext.encode()
+        )
+        ciphertext = encryption_response["CiphertextBlob"]
+
+        # Decrypt data
+        decryption_response = kms_client.decrypt(CiphertextBlob=ciphertext)
+        decrypted_plaintext = decryption_response["Plaintext"].decode()
+
+        # Assert the original plaintext matches the decrypted plaintext
+        self.assertEqual(plaintext, decrypted_plaintext)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-lambda.py b/tests/unit_test/unit-test-lambda.py
new file mode 100644
index 00000000..863ae5ce
--- /dev/null
+++ b/tests/unit_test/unit-test-lambda.py
@@ -0,0 +1,65 @@
+"""
+Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+SPDX-License-Identifier: Apache-2.0
+"""
+import logging
+import unittest
+import boto3
+from config import lambda_function_names, region, env
+
+class LambdaMockTests(unittest.TestCase):
+    """
+    Unit tests for AWS Lambda functions.
+
+    These tests validate the existence of Lambda functions with the specified names.
+    """
+    def setUp(self):
+        """
+        Set up the test case by initializing the AWS Lambda client.
+        """
+        # Initialize the AWS Lambda client
+        self.lambda_client = boto3.client('lambda', region_name=region)
+
+    def test_lambda_functions_created(self):
+        """
+        Test if the expected Lambda functions have been created.
+
+        This test checks if the Lambda functions exist and logs debugging information.
+
+        Raises:
+            AssertionError: If any of the expected Lambda functions are not found.
+        """
+        # Log information for debugging
+        logging.info(f"Testing Lambda Functions in Region: {region}, Environment: {env}")
+
+        # Check if the Lambda functions exist
+        try:
+            # Use Boto3 to list Lambda functions
+            response = self.lambda_client.list_functions()
+            lambda_functions = response['Functions']
+
+            existing_function_names = [func['FunctionName'] for func in lambda_functions]
+
+            for function_name in lambda_function_names:
+                self.assertIn(function_name, existing_function_names, f"Lambda Function '{function_name}' not found.")
+
+            logging.info("All expected Lambda Functions have been created.")
+        except Exception as e:
+            logging.warning(f"Error while checking Lambda Functions: {str(e)}")
+
+if __name__ == "__main__":
+    unittest.main()
+    logging.shutdown()
diff --git a/tests/unit_test/unit-test-loadbalancer.py b/tests/unit_test/unit-test-loadbalancer.py
index b4a2581f..18daf431 100644
--- a/tests/unit_test/unit-test-loadbalancer.py
+++ b/tests/unit_test/unit-test-loadbalancer.py
@@ -16,55 +16,47 @@
 SPDX-License-Identifier: Apache-2.0
 """
 
-import logging
 import unittest
-
 import boto3
-from config import (  # Import the 'env' variable and 'api_gateway_name' from your config   # noqa: E501
-    api_gateway,
-    env,
-    region,
-)
+import logging
 
+from config import region, load_balancer, env
 
-class TestApiGatewayCreation(unittest.TestCase):
+
+class TestLoadBalancerCreation(unittest.TestCase):
     def setUp(self):
-        # Initialize the AWS API Gateway client
-        self.apigateway_client = boto3.client("apigateway", region_name=region)
+        # Initialize the AWS ELB client
+        self.elb_client = boto3.client("elbv2", region_name=region)
 
-    @unittest.skipIf(env == "dev", "Skipping test in dev environment")
-    def test_api_gateway_created(self):
-        # Log the API Gateway name and other relevant information for debugging
+    @unittest.skipIf(env == "dev", "Skipping test in dev environment.")
+    def test_load_balancer_created(self):
+        # Log the load balancer name and other relevant information for debugging
         logging.info(
-            f"Testing API Gateway: {api_gateway}, Region: {region}, Environment: {env}"  # noqa: E501
+            f"Testing load balancer: {load_balancer}, Region: {region}, Environment: {env}"
         )
 
-        # Check if the API Gateway exists
+        # Check if the load balancer exists
         try:
-            response = self.apigateway_client.get_rest_apis()
-            api_gateways = response["items"]
-
-            # Filter API Gateways by name
-            matching_api_gateways = [
-                api for api in api_gateways if api["name"] == api_gateway
-            ]
+            response = self.elb_client.describe_load_balancers(Names=[load_balancer])
+            load_balancer_count = len(response["LoadBalancers"])
 
-            if len(matching_api_gateways) == 1:
-                logging.info(f"API Gateway '{api_gateway}' has been created.")
-            elif len(matching_api_gateways) == 0:
-                logging.warning(f"API Gateway '{api_gateway}' not found.")
+            if load_balancer_count == 1:
+                logging.info(f"Load balancer '{load_balancer}' has been created.")
+            elif load_balancer_count == 0:
+                logging.warning(f"Load balancer '{load_balancer}' not found.")
             else:
                 logging.warning(
-                    f"Multiple API Gateways with the name '{api_gateway}' found."  # noqa: E501
+                    f"Multiple load balancers with the name '{load_balancer}' found."
                 )
 
             self.assertEqual(
-                len(matching_api_gateways),
-                1,
-                "Expected one API Gateway to be created.",  # noqa: E501
+                load_balancer_count, 1, "Expected one load balancer to be created."
             )
-        except Exception as e:
-            logging.warning(f"Error while checking API Gateway: {str(e)}")
+        except self.elb_client.exceptions.ClientError as e:
+            if e.response["Error"]["Code"] == "LoadBalancerNotFound":
+                logging.warning(f"Load balancer '{load_balancer}' not found.")
+            else:
+                raise
 
 
 if __name__ == "__main__":
diff --git a/tests/unit_test/unit-test-nat.py b/tests/unit_test/unit-test-nat.py
new file mode 100644
index 00000000..1a09a5d5
--- /dev/null
+++ b/tests/unit_test/unit-test-nat.py
@@ -0,0 +1,61 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import unittest
+
+import boto3
+from config import region, vpc_cidr
+from moto import mock_ec2
+
+try:
+    ec2_client = boto3.client("ec2", region_name=region)
+except Exception as e:
+    logging.error("Error creating EC2 client: " + str(e))
+
+
+class NATGatewayMockTests(unittest.TestCase):
+    @mock_ec2
+    def test_create_describe_delete_nat_gateway(self):
+
+        # Create a VPC
+        vpc_response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = vpc_response["Vpc"]["VpcId"]
+
+        # Create a subnet
+        subnet_response = ec2_client.create_subnet(VpcId=vpc_id, CidrBlock=vpc_cidr)
+        subnet_id = subnet_response["Subnet"]["SubnetId"]
+
+        # Create an elastic IP
+        elastic_ip_response = ec2_client.allocate_address(Domain="vpc")
+        elastic_ip = elastic_ip_response["AllocationId"]
+
+        # Create a NAT Gateway
+        nat_gateway_response = ec2_client.create_nat_gateway(
+            SubnetId=subnet_id, AllocationId=elastic_ip
+        )
+        nat_gateway_id = nat_gateway_response["NatGateway"]["NatGatewayId"]
+
+        # Describe NAT Gateway
+        nat_gateway_info = ec2_client.describe_nat_gateways(
+            NatGatewayIds=[nat_gateway_id]
+        )
+        nat_gateway_state = nat_gateway_info["NatGateways"][0]["State"]
+
+        # Assert NAT Gateway state
+        self.assertEqual(nat_gateway_state, "available")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-route53.py b/tests/unit_test/unit-test-route53.py
new file mode 100644
index 00000000..3eedd670
--- /dev/null
+++ b/tests/unit_test/unit-test-route53.py
@@ -0,0 +1,93 @@
+"""
+Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+SPDX-License-Identifier: Apache-2.0
+"""
+import logging
+import unittest
+
+import boto3
+from moto import mock_route53
+from config import ec2_instance_connect_endpoint, region, env
+
+class TestRoute53(unittest.TestCase):
+    """
+    Unit tests for Route 53 DNS record creation.
+
+    These tests validate the creation of a DNS record in Route 53 when the environment is 'prod'.
+    """
+    # Define a decorator to skip the test if the environment is "dev"
+    def skip_if_dev(func):
+        def wrapper(self, *args, **kwargs):
+            if env != "prod":
+                self.skipTest("Skipping test in 'dev' environment")
+            else:
+                func(self, *args, **kwargs)
+
+        return wrapper
+    
+    @skip_if_dev
+    @mock_route53
+    def test_create_dns_record(self):
+        """
+        Test the creation of a DNS record in Route 53.
+
+        This test creates a mock Route 53 client, a hosted zone, and a DNS record. It checks if the DNS record was created successfully.
+
+        Raises:
+            AssertionError: If the DNS record creation does not return an HTTP status code of 200.
+        """
+        # Create a mock Route 53 client
+        route53_client = boto3.client('route53', region_name=region)
+
+        # Create a hosted zone
+        hosted_zone_name = 'xgrid.co'
+        response = route53_client.create_hosted_zone(
+            Name=hosted_zone_name,
+            CallerReference='test-123'
+        )
+        hosted_zone_id = response['HostedZone']['Id']
+
+        # Define DNS record details
+        dns_name = 'xccc.xgrid.co'
+        dns_type = 'A'
+        dns_value = '192.168.1.1'  # Random DNS value for testing.
+
+        # Create a DNS record
+        dns_record_change = {
+            'Changes': [
+                {
+                    'Action': 'CREATE',
+                    'ResourceRecordSet': {
+                        'Name': dns_name,
+                        'Type': dns_type,
+                        'TTL': 300,
+                        'ResourceRecords': [{'Value': dns_value}]
+                    }
+                }
+            ]
+        }
+
+        response = route53_client.change_resource_record_sets(
+            HostedZoneId=hosted_zone_id,
+            ChangeBatch=dns_record_change
+        )
+
+
+        # Check if the DNS record was created successfully
+        self.assertEqual(response['ResponseMetadata']['HTTPStatusCode'], 200)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-s3.py b/tests/unit_test/unit-test-s3.py
new file mode 100644
index 00000000..67121291
--- /dev/null
+++ b/tests/unit_test/unit-test-s3.py
@@ -0,0 +1,75 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import unittest
+
+import boto3
+from config import region, s3_bucket, s3_bucket_tags
+from moto import mock_s3
+
+try:
+    s3_client = boto3.client("s3")
+except Exception as e:
+    logging.error("Error creating S3 client: " + str(e))
+
+
+class S3MockTests(unittest.TestCase):
+    @mock_s3
+    def test_create_bucket(self):
+        bucket_name = s3_bucket
+
+        s3_client.create_bucket(
+            Bucket=bucket_name,
+            CreateBucketConfiguration={"LocationConstraint": region},
+        )
+        logging.info("Bucket created successfully: %s", bucket_name)
+
+        response = s3_client.list_buckets()
+        buckets = response["Buckets"]
+        self.assertEqual(len(buckets), 1)
+        self.assertEqual(buckets[0]["Name"], bucket_name)
+
+    @mock_s3
+    def test_check_bucket_tags(self):
+        bucket_name = s3_bucket
+
+        s3_client.create_bucket(
+            Bucket=bucket_name,
+            CreateBucketConfiguration={"LocationConstraint": region},
+        )
+
+        tags = s3_bucket_tags
+
+        tag_set = [{"Key": key, "Value": value} for key, value in tags.items()]
+        s3_client.put_bucket_tagging(
+            Bucket=bucket_name,
+            Tagging={"TagSet": tag_set},
+        )
+        response = s3_client.get_bucket_tagging(Bucket=bucket_name)
+        tags_res = response["TagSet"]
+        if tags:
+            logging.info("Tags for bucket: %s", bucket_name)
+        else:
+            logging.debug("No tags found for bucket: %s", bucket_name)
+
+        self.assertEqual(len(tags_res), 4)
+
+        for index, tag_key in enumerate(tags.keys()):
+            self.assertEqual(tags_res[index]["Key"], tag_key)
+            self.assertEqual(tags_res[index]["Value"], tags[tag_key])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-sqs.py b/tests/unit_test/unit-test-sqs.py
new file mode 100644
index 00000000..c41c50d1
--- /dev/null
+++ b/tests/unit_test/unit-test-sqs.py
@@ -0,0 +1,75 @@
+"""
+Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+SPDX-License-Identifier: Apache-2.0
+"""
+import unittest
+import boto3
+from moto import mock_sqs
+from config import region, sqs_name
+
+class TestSQSService(unittest.TestCase):
+    """
+    Unit tests for Amazon Simple Queue Service (SQS).
+
+    These tests validate sending and receiving messages to and from an SQS queue, including error scenarios.
+    """
+
+    @mock_sqs
+    def test_send_and_receive_message(self):
+        """
+        Test sending and receiving a message to/from an SQS queue, including error scenarios.
+
+        This test creates a mock SQS client and a mock SQS queue, sends a message to the queue, and then receives the message.
+        It checks if a message was received and if it matches the sent message. It also covers error scenarios such as
+        sending a message to a non-existent queue and receiving a message from an empty queue.
+
+        Raises:
+            AssertionError: If any part of the test fails, including error scenarios.
+        """
+        # Create a mock SQS client
+        sqs_client = boto3.client("sqs", region_name=region)
+
+        # Create a mock SQS queue
+        queue_name = sqs_name
+        queue_url = sqs_client.create_queue(QueueName=queue_name)["QueueUrl"]
+
+        # Test sending a message to a non-existent queue
+        non_existent_queue_url = "https://sqs.us-east-1.amazonaws.com/123456789012/NonExistentQueue"
+        with self.assertRaises(boto3.exceptions.botocore.exceptions.ClientError):
+            sqs_client.send_message(QueueUrl=non_existent_queue_url, MessageBody="Test message to non-existent queue")
+
+        # Send a message to the queue
+        message_body = "Test message"
+        sqs_client.send_message(QueueUrl=queue_url, MessageBody=message_body)
+
+        # Receive a message from the empty queue
+        empty_queue_url = sqs_client.create_queue(QueueName="EmptyQueue")["QueueUrl"]
+        response = sqs_client.receive_message(QueueUrl=empty_queue_url, MaxNumberOfMessages=1)
+        self.assertNotIn("Messages", response)
+
+        # Receive a message from the queue
+        response = sqs_client.receive_message(QueueUrl=queue_url, MaxNumberOfMessages=1)
+
+        # Check if a message was received
+        self.assertIn("Messages", response)
+        self.assertEqual(len(response["Messages"]), 1)
+
+        # Check if the received message matches the sent message
+        received_message = response["Messages"][0]["Body"]
+        self.assertEqual(received_message, message_body)
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/tests/unit_test/unit-test-vpc.py b/tests/unit_test/unit-test-vpc.py
new file mode 100644
index 00000000..bf8ea622
--- /dev/null
+++ b/tests/unit_test/unit-test-vpc.py
@@ -0,0 +1,163 @@
+# Copyright (c) 2023, Xgrid Inc, https://xgrid.co
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#        http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import unittest
+
+import boto3
+from config import region, vpc_cidr, vpc_private_subnet, vpc_public_subnet
+from moto import mock_ec2
+
+try:
+    ec2_client = boto3.client("ec2", region_name=region)
+except Exception as e:
+    logging.error("Error creating EC2 client: " + str(e))
+
+
+class MyVPCTest(unittest.TestCase):
+    @mock_ec2
+    def test_create_vpc(self):
+
+        # Create a mock VPC
+        response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Test VPC creation
+        self.assertEqual(response["Vpc"]["CidrBlock"], vpc_cidr)
+
+        # Test VPC retrieval
+        vpc = ec2_client.describe_vpcs(VpcIds=[vpc_id])["Vpcs"][0]
+        self.assertEqual(vpc["VpcId"], vpc_id)
+        self.assertEqual(vpc["CidrBlock"], vpc_cidr)
+
+    @mock_ec2
+    def test_vpc_with_igw_and_subnet(self):
+        # Create a mock VPC
+        response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Create a mock internet gateway (IGW)
+        response = ec2_client.create_internet_gateway()
+        igw_id = response["InternetGateway"]["InternetGatewayId"]
+
+        # Attach the IGW to the VPC
+        ec2_client.attach_internet_gateway(InternetGatewayId=igw_id, VpcId=vpc_id)
+
+        # Create a mock subnet
+        response = ec2_client.create_subnet(CidrBlock=vpc_cidr, VpcId=vpc_id)
+
+        # Perform your test assertions
+        self.assertEqual(response["Subnet"]["CidrBlock"], vpc_cidr)
+        self.assertEqual(response["Subnet"]["VpcId"], vpc_id)
+
+    @mock_ec2
+    def test_delete_vpc(self):
+
+        # Create a mock VPC
+        response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Delete the VPC
+        response = ec2_client.delete_vpc(VpcId=vpc_id)
+
+        # Test VPC deletion
+        self.assertEqual(response["ResponseMetadata"]["HTTPStatusCode"], 200)
+
+        # Try to retrieve the deleted VPC
+        with self.assertRaises(ec2_client.exceptions.ClientError) as context:
+            ec2_client.describe_vpcs(VpcIds=[vpc_id])
+
+        self.assertEqual(
+            context.exception.response["Error"]["Code"], "InvalidVpcID.NotFound"
+        )
+
+    @mock_ec2
+    def test_create_route_table(self):
+        # Create a mock VPC
+        response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Create a mock route table
+        response = ec2_client.create_route_table(VpcId=vpc_id)
+        route_table_id = response["RouteTable"]["RouteTableId"]
+
+        # Perform your test assertions
+        self.assertEqual(response["RouteTable"]["VpcId"], vpc_id)
+        self.assertEqual(response["RouteTable"]["Associations"], [])
+        self.assertEqual(response["RouteTable"]["RouteTableId"], route_table_id)
+
+    @mock_ec2
+    def test_route_table_association(self):
+        # Create a mock VPC
+        response = ec2_client.create_vpc(CidrBlock=vpc_cidr)
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Create a mock subnet
+        response = ec2_client.create_subnet(CidrBlock=vpc_cidr, VpcId=vpc_id)
+        subnet_id = response["Subnet"]["SubnetId"]
+
+        # Create a mock route table
+        response = ec2_client.create_route_table(VpcId=vpc_id)
+        route_table_id = response["RouteTable"]["RouteTableId"]
+
+        # Associate the route table with the subnet
+        response = ec2_client.associate_route_table(
+            RouteTableId=route_table_id, SubnetId=subnet_id
+        )
+
+        self.assertIsNotNone(response)
+        self.assertIn("AssociationId", response)
+
+    @mock_ec2
+    def test_create_vpc_public_private_subnets(self):
+        # Create a VPC
+        response = ec2_client.create_vpc(
+            CidrBlock=vpc_cidr, AmazonProvidedIpv6CidrBlock=True
+        )
+        vpc_id = response["Vpc"]["VpcId"]
+
+        # Create public subnet
+        public_subnet_response = ec2_client.create_subnet(
+            VpcId=vpc_id,
+            CidrBlock=vpc_public_subnet,
+        )
+        public_subnet_id = public_subnet_response["Subnet"]["SubnetId"]
+
+        # Create private subnet
+        private_subnet_response = ec2_client.create_subnet(
+            VpcId=vpc_id,
+            CidrBlock=vpc_private_subnet,
+        )
+        private_subnet_id = private_subnet_response["Subnet"]["SubnetId"]
+
+        # Verify VPC and subnets
+        vpcs = ec2_client.describe_vpcs(VpcIds=[vpc_id])["Vpcs"]
+        self.assertEqual(len(vpcs), 1)
+        self.assertEqual(vpcs[0]["VpcId"], vpc_id)
+
+        subnets = ec2_client.describe_subnets(
+            SubnetIds=[public_subnet_id, private_subnet_id]
+        )["Subnets"]
+        self.assertEqual(len(subnets), 2)
+        self.assertIn(public_subnet_id, [subnet["SubnetId"] for subnet in subnets])
+        self.assertIn(private_subnet_id, [subnet["SubnetId"] for subnet in subnets])
+
+        # Clean up resources
+        ec2_client.delete_subnet(SubnetId=public_subnet_id)
+        ec2_client.delete_subnet(SubnetId=private_subnet_id)
+        ec2_client.delete_vpc(VpcId=vpc_id)
+
+
+if __name__ == "__main__":
+    unittest.main()