Fix up a merge issue and stray input

Author: whithajess

events/codepipeline_test.go

@@ -10,15 +10,15 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestCodePipeLineJEventMarshaling(t *testing.T) {
+func TestCodePipeLineEventMarshaling(t *testing.T) {
 
 	// read json from file
 	inputJSON, err := ioutil.ReadFile("./testdata/codepipeline-job-event.json")
 	if err != nil {
 		t.Errorf("could not open test file. details: %v", err)
 	}
 
-	// de-serialize into CognitoEvent
+	// de-serialize into CodePipelineEvent
 	var inputEvent CodePipelineEvent
 	if err := json.Unmarshal(inputJSON, &inputEvent); err != nil {
 		t.Errorf("could not unmarshal event. details: %v", err)