diff --git a/authhandler_test.go b/authhandler_test.go
index d0dc943..1b919a9 100644
--- a/authhandler_test.go
+++ b/authhandler_test.go
@@ -16,17 +16,17 @@ func TestGenChallenge(t *testing.T) {
 }
 
 func TestGenClientCookie(t *testing.T) {
-  	authHandler := new(AuthenticationHandler)  
-  	clientCookie := authHandler.GenClientCookie()
-  	if clientCookie != authHandler.clientCookie {
-  	    t.Errorf("AuthenticationHandler Client Cookies are Different", clientCookie, authHandler.clientCookie)
-  	}
+	authHandler := new(AuthenticationHandler)
+	clientCookie := authHandler.GenClientCookie()
+	if clientCookie != authHandler.clientCookie {
+		t.Errorf("AuthenticationHandler Client Cookies are Different", clientCookie, authHandler.clientCookie)
+	}
 }
 
 func TestGenServerCookie(t *testing.T) {
-  	authHandler := new(AuthenticationHandler)  
-  	serverCookie := authHandler.GenServerCookie()
-  	if serverCookie != authHandler.serverCookie {
-  	    t.Errorf("AuthenticationHandler Server Cookies are Different", serverCookie, authHandler.serverCookie)
-  	}
+	authHandler := new(AuthenticationHandler)
+	serverCookie := authHandler.GenServerCookie()
+	if serverCookie != authHandler.serverCookie {
+		t.Errorf("AuthenticationHandler Server Cookies are Different", serverCookie, authHandler.serverCookie)
+	}
 }
diff --git a/messagebuilder_test.go b/messagebuilder_test.go
index 0ee8a78..1d5ace9 100644
--- a/messagebuilder_test.go
+++ b/messagebuilder_test.go
@@ -11,10 +11,9 @@ func TestOpenChatChannel(t *testing.T) {
 	// TODO: More Indepth Test Of Output
 }
 
-
 func TestOpenContactRequestChannel(t *testing.T) {
 	messageBuilder := new(MessageBuilder)
-	_, err := messageBuilder.OpenContactRequestChannel(3,"Nickname","Message")
+	_, err := messageBuilder.OpenContactRequestChannel(3, "Nickname", "Message")
 	if err != nil {
 		t.Errorf("Error building open contact request channel message: %s", err)
 	}
@@ -23,7 +22,7 @@ func TestOpenContactRequestChannel(t *testing.T) {
 
 func TestOpenAuthenticationChannel(t *testing.T) {
 	messageBuilder := new(MessageBuilder)
-	_, err := messageBuilder.OpenAuthenticationChannel(1,[16]byte{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0})
+	_, err := messageBuilder.OpenAuthenticationChannel(1, [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0})
 	if err != nil {
 		t.Errorf("Error building open authentication channel message: %s", err)
 	}