diff --git a/impl/getcomputername.cpp b/impl/getcomputername.cpp
index 66a34e67e..1ec69110c 100644
--- a/impl/getcomputername.cpp
+++ b/impl/getcomputername.cpp
@@ -3,10 +3,10 @@
 
 BOOL GetComputerName(LPTSTR name, LPDWORD len)
 {
-  int host =  gethostname(name, HOST_NAME_MAX);
-  if(host == 0)
-  {
-    return TRUE;
-  }  
-  return FALSE;
+    int host =  gethostname(name, HOST_NAME_MAX);
+    if(host == 0)
+    {
+        return TRUE;
+    }  
+    return FALSE;
 }
diff --git a/tests/test-getcomputername.cpp b/tests/test-getcomputername.cpp
index f4ce811fc..8b0f19f5d 100644
--- a/tests/test-getcomputername.cpp
+++ b/tests/test-getcomputername.cpp
@@ -4,25 +4,24 @@
 TEST(GetComputerName,simple)
 {	
     char hostname[HOST_NAME_MAX];
-    TCHAR hostnameFunctionTest[HOST_NAME_MAX];
+    std::string hostnameFunctionTest;
     DWORD hostSize = HOST_NAME_MAX;
-
-    BOOL getComputerName = GetComputerName(hostnameFunctionTest, &hostSize);
+    BOOL getComputerName = GetComputerName(&hostnameFunctionTest[0], &hostSize);
     BOOL host =  gethostname(hostname, sizeof hostname);
 
     if(host == 0)
     {
-      host = TRUE;    
+        host = TRUE;    
     }
     else
     {
-      host = FALSE;
+        host = FALSE;
     }
 
-    std::string hostnameSting(hostname);
-    std::string hostnameStingTest(hostnameFunctionTest);
+    std::string hostnameString(hostname);
+    std::string hostnameStringTest(&hostnameFunctionTest[0]);
   
     ASSERT_TRUE(getComputerName == TRUE);
     ASSERT_EQ(host,TRUE);
-    ASSERT_EQ(hostnameSting,hostnameFunctionTest);
+    ASSERT_EQ(hostnameString,hostnameStringTest);
 }
\ No newline at end of file