diff --git a/foo_test.go b/foo_test.go
index afa64e1c..6c551868 100644
--- a/foo_test.go
+++ b/foo_test.go
@@ -8,6 +8,6 @@ import (
 
 func TestFoo(t *testing.T) {
 	m := newMockfoo(t)
-	m.EXPECT().Bar().Return(baz("foo"))
-	assert.Equal(t, "foo", m.Bar())
+	m.EXPECT().Bar().Return("foo")
+	assert.Equal(t, baz("foo"), m.Bar())
 }
diff --git a/internal/cmd/mockery.go b/internal/cmd/mockery.go
index 95b66f13..6f8da1ad 100644
--- a/internal/cmd/mockery.go
+++ b/internal/cmd/mockery.go
@@ -178,6 +178,18 @@ func (i *InterfaceCollection) Append(ctx context.Context, iface *internal.Interf
 	return nil
 }
 
+func writeFile(path string, data []byte) error {
+	f, err := os.Create(path)
+	if err != nil {
+		return stackerr.NewStackErr(err)
+	}
+	defer f.Close()
+	if _, err = f.Write(data); err != nil {
+		return stackerr.NewStackErr(err)
+	}
+	return nil
+}
+
 func (r *RootApp) Run() error {
 	remoteTemplateCache := make(map[string]*internal.RemoteTemplate)
 
@@ -374,13 +386,8 @@ func (r *RootApp) Run() error {
 			return fmt.Errorf("outfile exists")
 		}
 
-		file, err := os.Create(outFilePath)
-		if err != nil {
-			return stackerr.NewStackErr(err)
-		}
-		defer file.Close()
-		if _, err = file.Write(templateBytes); err != nil {
-			return stackerr.NewStackErr(err)
+		if err := writeFile(outFilePath, templateBytes); err != nil {
+			return err
 		}
 	}