diff --git a/csprng/source_test.go b/csprng/source_test.go
index 054552a169e93d4d406161087fcb584f105edede..3667cd76a944eb5fbf8c7edda95edd8ece1940c5 100644
--- a/csprng/source_test.go
+++ b/csprng/source_test.go
@@ -260,7 +260,7 @@ func TestGenerateInGroup_LargeSize(t *testing.T) {
 	}
 }
 
-//Happy path with a large, byte aligned path
+// Happy path with a large, byte aligned path
 func TestGenerate(t *testing.T) {
 	rng := NewSystemRNG()
 
@@ -278,7 +278,7 @@ func TestGenerate(t *testing.T) {
 
 }
 
-//Happy path with a non byte aligned prime
+// Happy path with a non byte aligned prime
 func TestGenerate_Padding(t *testing.T) {
 	rng := NewSystemRNG()
 
diff --git a/csprng/systemRNG_test.go b/csprng/systemRNG_test.go
index 056f6107d5e9f766e0ca92fb187537af2753d00c..91b826d06ef393c67f20f737861b3651f40d7dca 100644
--- a/csprng/systemRNG_test.go
+++ b/csprng/systemRNG_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 )
 
-//Tests that the NewSystemRNG meets the source constructor and returns a valid SystemRNG in the interface
+// Tests that the NewSystemRNG meets the source constructor and returns a valid SystemRNG in the interface
 func TestNewSystemRNG(t *testing.T) {
 
 	var sc SourceConstructor
@@ -29,7 +29,7 @@ func TestNewSystemRNG(t *testing.T) {
 	}
 }
 
-//Spot check that the results of the rng vary
+// Spot check that the results of the rng vary
 func TestSystemRNG_Read(t *testing.T) {
 	csprig := NewSystemRNG()
 
@@ -55,7 +55,7 @@ func TestSystemRNG_Read(t *testing.T) {
 	}
 }
 
-//Spot check that the set seed function does nothing
+// Spot check that the set seed function does nothing
 func TestSystemRNG_SetSeed(t *testing.T) {
 	csprig := NewSystemRNG()
 
diff --git a/randomness/range_test.go b/randomness/range_test.go
index 01b6206c4a7804b6c9987358e30f931c9da534e7..ff481441f16b15857cc613a7a516abf195d85612 100644
--- a/randomness/range_test.go
+++ b/randomness/range_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 )
 
-//TestReadRangeSmoke will check that the results of ReadRangeUint32 gets random
+// TestReadRangeSmoke will check that the results of ReadRangeUint32 gets random
 // numbers from inside the right range. It verifies that it is in the range.
 func TestReadRangeSmoke(t *testing.T) {
 	src := rand.NewSource(42)
@@ -32,7 +32,7 @@ func TestReadRangeSmoke(t *testing.T) {
 	}
 }
 
-//TestReadRangeShort panic's the read range by making the buffer to small
+// TestReadRangeShort panic's the read range by making the buffer to small
 func TestReadRangeShort(t *testing.T) {
 	rng := strings.NewReader("ts")
 
diff --git a/tls/credentials_test.go b/tls/credentials_test.go
index 0bed622fbbc85c98ba3370503205bdb7b5cb2c71..db6f7a0aca3475c8182c0840794ccc2ceed604b6 100644
--- a/tls/credentials_test.go
+++ b/tls/credentials_test.go
@@ -16,7 +16,7 @@ import (
 	"testing"
 )
 
-//Happy path
+// Happy path
 func TestGetFullPath(t *testing.T) {
 	h, _ := homedir.Dir()
 	p := "~/test/test"
@@ -26,7 +26,7 @@ func TestGetFullPath(t *testing.T) {
 	}
 }
 
-//Happy path
+// Happy path
 func TestNewCredentialsFromFile(t *testing.T) {
 	path := testkeys.GetTestCertPath()
 	var tlsCreds credentials.TransportCredentials
@@ -39,7 +39,7 @@ func TestNewCredentialsFromFile(t *testing.T) {
 	}
 }
 
-//Error path: invalid path.
+// Error path: invalid path.
 func TestNewCredentialsFromFileError_BadPath(t *testing.T) {
 	path := testkeys.GetTestCertPath() + "sfdk"
 	_, err := NewCredentialsFromFile(path, "")
@@ -48,7 +48,7 @@ func TestNewCredentialsFromFileError_BadPath(t *testing.T) {
 	}
 }
 
-//Error path: invalid file (not a cert.
+// Error path: invalid file (not a cert.
 func TestNewCredentialsFromFileError_BadKey(t *testing.T) {
 	path := testkeys.GetTestKeyPath()
 	_, err := NewCredentialsFromFile(path, "")
@@ -57,7 +57,7 @@ func TestNewCredentialsFromFileError_BadKey(t *testing.T) {
 	}
 }
 
-//Happy path
+// Happy path
 func TestNewCredentialsFromPEM(t *testing.T) {
 	var tlsCreds credentials.TransportCredentials
 	tlsCreds, err := NewCredentialsFromPEM(Cert, "")
@@ -69,7 +69,7 @@ func TestNewCredentialsFromPEM(t *testing.T) {
 	}
 }
 
-//Error path
+// Error path
 func TestNewCredentialsFromPEMError(t *testing.T) {
 	_, err := NewCredentialsFromPEM("this is a cert yes", "")
 	if err == nil {
@@ -77,7 +77,7 @@ func TestNewCredentialsFromPEMError(t *testing.T) {
 	}
 }
 
-//Happy path
+// Happy path
 func TestNewPublicKeyFromFile(t *testing.T) {
 	path := testkeys.GetTestCertPath()
 	var p *rsa.PublicKey
@@ -90,7 +90,7 @@ func TestNewPublicKeyFromFile(t *testing.T) {
 	}
 }
 
-//Error path
+// Error path
 func TestNewPublicKeyFromFileError(t *testing.T) {
 	path := testkeys.GetTestCertPath() + "sdfsd"
 	badCertPath := testkeys.GetTestKeyPath()
@@ -105,7 +105,7 @@ func TestNewPublicKeyFromFileError(t *testing.T) {
 	}
 }
 
-//Happy path
+// Happy path
 func TestNewPublicKeyFromPEM(t *testing.T) {
 	path := testkeys.GetTestCertPath()
 	filePath := getFullPath(path)
@@ -124,7 +124,7 @@ func TestNewPublicKeyFromPEM(t *testing.T) {
 	}
 }
 
-//Error path: Pass in a key rather than a cert
+// Error path: Pass in a key rather than a cert
 func TestNewPublicKeyFromPEMError(t *testing.T) {
 
 	path := testkeys.GetTestKeyPath()
diff --git a/tls/tls_test.go b/tls/tls_test.go
index b59b7d3386e5e6f6fb273cf5310e136f25414b53..d7984bafc1525a73c6541bde8493a2972aa50922 100644
--- a/tls/tls_test.go
+++ b/tls/tls_test.go
@@ -112,7 +112,7 @@ jYe9f2NtMJWhPUps3+5Y+iFSn/FV0iy2bxw5BKN6Ovx9ztuCurY8Dg==
 -----END RSA PRIVATE KEY-----
 `
 
-//An ECDSA PKCS8 private key
+// An ECDSA PKCS8 private key
 const ECDSA_PRIVATEKEY = `-----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgVTfeWQAwaQ2fX1RM
 rzhicau6dkfnTZmRXMhSgHn1O/2hRANCAAQaG9n2s+E/HxSbEx4xn9lKQkOL7MzS
@@ -154,7 +154,7 @@ const ed25519Key = `-----BEGIN PRIVATE KEY-----
 MC4CAQAwBQYDK2VwBCIEIOCWuyHuYHEEUa334Qriq9PK9fwwtda1YJrjzqWwY9o6
 -----END PRIVATE KEY-----`
 
-//Error path: pass an empty file into the loaders
+// Error path: pass an empty file into the loaders
 func TestEmptyFile(t *testing.T) {
 	empty := ""
 	//Pass the empty string into loading the certificate
@@ -170,7 +170,7 @@ func TestEmptyFile(t *testing.T) {
 	}
 }
 
-//Error path: Pass incorrectly formated contents into the loaders
+// Error path: Pass incorrectly formated contents into the loaders
 func TestLoadIncorrectly(t *testing.T) {
 	//Pass the private key into the certificate loader
 	_, err := LoadCertificate(PrivateKeyPKCS1)
@@ -184,7 +184,7 @@ func TestLoadIncorrectly(t *testing.T) {
 	}
 }
 
-//Happy Path: pass everything as intended. No errors should occur in this test
+// Happy Path: pass everything as intended. No errors should occur in this test
 func TestTLS_SmokeTest(t *testing.T) {
 
 	// Load the PKCS#1 Key
@@ -218,7 +218,7 @@ func TestTLS_SmokeTest(t *testing.T) {
 
 }
 
-//Error path: Passes in an ecdsa pkcs#8 private key.
+// Error path: Passes in an ecdsa pkcs#8 private key.
 func TestTLS_IncorrectPrivateKey(t *testing.T) {
 	_, err := LoadRSAPrivateKey(ECDSA_PRIVATEKEY)
 	if err == nil {