diff --git a/tests/test.rs b/tests/test.rs
index 9133130..09c8172 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -3,7 +3,7 @@ use textsender_api::db;
 mod db_mgr {
     use std::str::FromStr;
 
-    pub const _LIMIT: usize = 6;
+    pub const LIMIT: usize = 6;
 
     pub async fn get_pool() -> Result<sqlx::PgPool, sqlx::Error> {
         let tm_db_url = textsender_models::envy::environment::get_db_url()
@@ -14,12 +14,9 @@ mod db_mgr {
     }
 
     pub async fn generate_db_name() -> String {
-        /*
         let db_name =
             get_database_name().await.unwrap() + &"_" + &uuid::Uuid::new_v4().to_string()[..LIMIT];
         db_name
-            */
-        format!("{}", get_database_name().await.unwrap())
     }
 
     pub async fn connect_to_db(db_name: &str) -> Result<sqlx::PgPool, sqlx::Error> {
@@ -32,11 +29,14 @@ mod db_mgr {
 
     pub async fn create_database(
         template_pool: &sqlx::PgPool,
-        _db_name: &str,
+        db_name: &str,
     ) -> Result<(), sqlx::Error> {
-        match sqlx::query(r#"CREATE DATABASE textsender_db"#)
-            .execute(template_pool)
-            .await
+        match sqlx::query(sqlx::AssertSqlSafe(format!(
+            r#"CREATE DATABASE {}"#,
+            db_name
+        )))
+        .execute(template_pool)
+        .await
         {
             Ok(_) => Ok(()),
             Err(e) => Err(e),
@@ -69,11 +69,14 @@ mod db_mgr {
     // Function to drop a database
     pub async fn drop_database(
         template_pool: &sqlx::PgPool,
-        _db_name: &str,
+        db_name: &str,
     ) -> Result<(), sqlx::Error> {
-        sqlx::query(r#"DROP DATABASE IF EXISTS textsender_db WITH (FORCE)"#)
-            .execute(template_pool)
-            .await?;
+        sqlx::query(sqlx::AssertSqlSafe(format!(
+            r#"DROP DATABASE IF EXISTS {} WITH (FORCE)"#,
+            db_name
+        )))
+        .execute(template_pool)
+        .await?;
         Ok(())
     }