diff --git a/src/cert-generator/tests/pkg/tls/mock.go b/src/cert-generator/tests/pkg/tls/mock.go
index c14f2ef..55a5305 100644
--- a/src/cert-generator/tests/pkg/tls/mock.go
+++ b/src/cert-generator/tests/pkg/tls/mock.go
@@ -45,9 +45,12 @@ func (i *pemMock) Encode(out io.Writer, b *pem.Block) error {
 }
 
 func (i *pemMock) Decode(data []byte) (*pem.Block, []byte) {
-	if i.decodePass {
+	fmt.Print(("Entering decode mock"))
+	if i.decodePass == true {
+		fmt.Print("returning pass")
 		return &pem.Block{Type: "test", Bytes: []byte{0xDE, 0xAD, 0xBE, 0xEF}}, nil
 	} else {
+		fmt.Print("returning fail")
 		return nil, nil
 	}
 }
diff --git a/src/cert-generator/tests/pkg/tls/x509_test.go b/src/cert-generator/tests/pkg/tls/x509_test.go
index 7eb9458..a8d4e9e 100644
--- a/src/cert-generator/tests/pkg/tls/x509_test.go
+++ b/src/cert-generator/tests/pkg/tls/x509_test.go
@@ -22,7 +22,7 @@ var (
 	}
 )
 
-func TestSetup(t *testing.T) {
+func SetUp(t *testing.T) {
 	tls.Ix509 = &testX509
 	tls.Ipem = &testPem
 	tls.Irsa = &testRsa
@@ -56,6 +56,7 @@ func TestRemoveEmptyStringNotEmptyString(t *testing.T) {
 }
 
 func TestPemToX509DecodeFail(t *testing.T) {
+	SetUp(t)
 	defer TearDown()
 	testPem.decodePass = false
 
@@ -69,12 +70,77 @@ func TestPemToX509DecodeFail(t *testing.T) {
 
 }
 func TestPemToX509DecodePass(t *testing.T) {
+	SetUp(t)
 	defer TearDown()
 	cert, err := tls.PemToX509(nil)
-	if reflect.TypeOf(cert).String() == string("*x509.Certificate") {
+
+	if reflect.TypeOf(cert).String() != string("*x509.Certificate") {
 		t.Errorf("cert should be type *x509.Certificate, got %T", cert)
 	}
 	if err != nil {
 		t.Errorf(" error should be nil, got %v", err)
 	}
 }
+
+func TestPemToX509ParseFail(t *testing.T) {
+	SetUp(t)
+	defer TearDown()
+	testX509.parseCertificatePass = false
+	cert, err := tls.PemToX509(nil)
+
+	if cert != nil {
+		t.Errorf("cert should be nil, got %v", cert)
+	}
+	if err.Error() != "FAIL" {
+		t.Errorf(" error message should be \"FAIL\", got %v", err)
+	}
+}
+
+func TestPemToX509ParsePass(t *testing.T) {
+	SetUp(t)
+	defer TearDown()
+	cert, err := tls.PemToX509(nil)
+
+	if cert == nil {
+		t.Errorf("cert should be \"*x509.Certificate\" type, got %v", cert)
+	}
+	if err != nil {
+		t.Errorf(" error message should be nil, got %v", err)
+	}
+}
+
+func TestCreateCACertBytesNullTemplate(t *testing.T) {
+	SetUp(t)
+	defer TearDown()
+
+	key, cert, err := tls.CreateCACertBytes(nil)
+	if key != nil {
+		t.Errorf(" key should be nil, got %v", err)
+	}
+	if cert != nil {
+		t.Errorf(" cert should be nil, got %v", err)
+	}
+	if err == nil {
+		t.Errorf(" error should be %s got nil", "tempalte must contain CommonName Field")
+	} else if err.Error() != "template is nil" {
+		t.Errorf(" error should be \"template is nil\" got %s", err)
+	}
+}
+
+func TestCreateCACertBytesNullNoCommonName(t *testing.T) {
+	SetUp(t)
+	defer TearDown()
+	ca := &tls.CACert{}
+	key, cert, err := tls.CreateCACertBytes(ca)
+	if key != nil {
+		t.Errorf(" key should be <nil>, got <%v>", err)
+	}
+	if cert != nil {
+		t.Errorf(" cert should be <nil>, got <%v>", err)
+	}
+	if err == nil {
+		t.Errorf(" error should be %s got nil", "tempalte must contain CommonName Field")
+	} else if err.Error() != "template must contain CommonName Field" {
+		t.Errorf(" error should be <template must contain CommonName Field> got <%s>", err)
+	}
+}