diff --git a/modules/point-to-site-vpn-gateway/src/main.tf b/modules/point-to-site-vpn-gateway/src/main.tf
index 5bca5ee..e28dbcf 100644
--- a/modules/point-to-site-vpn-gateway/src/main.tf
+++ b/modules/point-to-site-vpn-gateway/src/main.tf
@@ -1,7 +1,7 @@
 resource "azurerm_point_to_site_vpn_gateway" "main" {
   name                = "p2svpngw-${var.zone}-${var.environment}-${lookup(local.short_locations, var.location)}-${local.identifier}"
   location            = var.location
-  resource_group_name = module.resource_group.name
+  resource_group_name = var.resource_group_name
 
   dns_servers                 = var.dns_servers
   scale_unit                  = var.scale_unit
@@ -21,7 +21,7 @@ resource "azurerm_point_to_site_vpn_gateway" "main" {
 
 resource "azurerm_monitor_diagnostic_setting" "main" {
   name                       = "log-analytics"
-  target_resource_id         = azurerm_key_vault.main.id
+  target_resource_id         = azurerm_point_to_site_vpn_gateway.main.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
   dynamic "enabled_log" {
diff --git a/modules/point-to-site-vpn-gateway/test/main.tf b/modules/point-to-site-vpn-gateway/test/main.tf
index c70cb6d..f0fc435 100644
--- a/modules/point-to-site-vpn-gateway/test/main.tf
+++ b/modules/point-to-site-vpn-gateway/test/main.tf
@@ -11,9 +11,10 @@ module "point_to_site_vpn_gateway" {
   resource_group_name = "qux"
   zone                = "corge"
 
-  virtual_hub_id                           = "corge"
+  log_analytics_workspace_id               = "grault"
+  virtual_hub_id                           = "garply"
   vpn_client_address_pool_address_prefixes = []
-  vpn_server_configuration_id              = "grault"
+  vpn_server_configuration_id              = "waldo"
 
   tags = {
     Foo = "Bar"