diff --git a/commands/server_test.go b/commands/server_test.go
index 1e1343d44..57a500859 100644
--- a/commands/server_test.go
+++ b/commands/server_test.go
@@ -34,7 +34,7 @@ func TestFixUrl(t *testing.T) {
 		serverPort = test.Port
 		result, err := fixUrl(BaseUrl)
 		if err != nil {
-			t.Errorf("Test #%d %s: unexpected error %s", err)
+			t.Errorf("Test #%d %s: unexpected error %s", i, test.TestName, err)
 		}
 		if result != test.Result {
 			t.Errorf("Test #%d %s: expected %q, got %q", i, test.TestName, test.Result, result)
diff --git a/helpers/content.go b/helpers/content.go
index 914fdfda5..a34159a14 100644
--- a/helpers/content.go
+++ b/helpers/content.go
@@ -111,7 +111,7 @@ func BytesToHTML(b []byte) template.HTML {
 	return template.HTML(string(b))
 }
 
-func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Renderer {
+func GetHtmlRenderer(defaultFlags int, ctx *RenderingContext) blackfriday.Renderer {
 	renderParameters := blackfriday.HtmlRendererParameters{
 		FootnoteAnchorPrefix:       viper.GetString("FootnoteAnchorPrefix"),
 		FootnoteReturnLinkContents: viper.GetString("FootnoteReturnLinkContents"),
@@ -141,7 +141,7 @@ func GetHtmlRenderer(defaultFlags int, ctx RenderingContext) blackfriday.Rendere
 	return blackfriday.HtmlRendererWithParameters(htmlFlags, "", "", renderParameters)
 }
 
-func GetMarkdownExtensions(ctx RenderingContext) int {
+func GetMarkdownExtensions(ctx *RenderingContext) int {
 	flags := 0 | blackfriday.EXTENSION_NO_INTRA_EMPHASIS |
 		blackfriday.EXTENSION_TABLES | blackfriday.EXTENSION_FENCED_CODE |
 		blackfriday.EXTENSION_AUTOLINK | blackfriday.EXTENSION_STRIKETHROUGH |
@@ -155,12 +155,12 @@ func GetMarkdownExtensions(ctx RenderingContext) int {
 	return flags
 }
 
-func MarkdownRender(ctx RenderingContext) []byte {
+func MarkdownRender(ctx *RenderingContext) []byte {
 	return blackfriday.Markdown(ctx.Content, GetHtmlRenderer(0, ctx),
 		GetMarkdownExtensions(ctx))
 }
 
-func MarkdownRenderWithTOC(ctx RenderingContext) []byte {
+func MarkdownRenderWithTOC(ctx *RenderingContext) []byte {
 	return blackfriday.Markdown(ctx.Content,
 		GetHtmlRenderer(blackfriday.HTML_TOC, ctx),
 		GetMarkdownExtensions(ctx))
@@ -219,7 +219,7 @@ func (c *RenderingContext) getConfig() *Blackfriday {
 	return c.Config
 }
 
-func RenderBytesWithTOC(ctx RenderingContext) []byte {
+func RenderBytesWithTOC(ctx *RenderingContext) []byte {
 	switch ctx.PageFmt {
 	default:
 		return MarkdownRenderWithTOC(ctx)
@@ -230,7 +230,7 @@ func RenderBytesWithTOC(ctx RenderingContext) []byte {
 	}
 }
 
-func RenderBytes(ctx RenderingContext) []byte {
+func RenderBytes(ctx *RenderingContext) []byte {
 	switch ctx.PageFmt {
 	default:
 		return MarkdownRender(ctx)
diff --git a/helpers/general_test.go b/helpers/general_test.go
index 527ba6fac..13a6f13fe 100644
--- a/helpers/general_test.go
+++ b/helpers/general_test.go
@@ -204,7 +204,7 @@ func TestDoArithmetic(t *testing.T) {
 		result, err := DoArithmetic(this.a, this.b, this.op)
 		if b, ok := this.expect.(bool); ok && !b {
 			if err == nil {
-				t.Errorf("[%d] doArithmetic didn't return an expected error")
+				t.Errorf("[%d] doArithmetic didn't return an expected error", i)
 			}
 		} else {
 			if err != nil {
diff --git a/helpers/path_test.go b/helpers/path_test.go
index 9be1c9fc4..66fe5457f 100644
--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -107,7 +107,7 @@ func TestMakePathRelative(t *testing.T) {
 	_, error := MakePathRelative("a/b/c.ss", "/a/c", "/d/c", "/e/f")
 
 	if error == nil {
-		t.Errorf("Test #%d failed. Expected error")
+		t.Errorf("Test failed, expected error")
 	}
 }
 
@@ -497,7 +497,7 @@ func TestFileAndExt(t *testing.T) {
 			t.Errorf("Test %d failed. Expected filename %q got %q.", i, d.expectedFile, file)
 		}
 		if d.expectedExt != ext {
-			t.Errorf("Test %d failed. Expected extension $q got %q.", i, d.expectedExt, ext)
+			t.Errorf("Test %d failed. Expected extension %q got %q.", i, d.expectedExt, ext)
 		}
 	}
 
@@ -564,7 +564,7 @@ func TestFindCWD(t *testing.T) {
 			t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedDir, dir)
 		}
 		if d.expectedErr != err {
-			t.Error("Test %d failed. Expected %q but got %q", i, d.expectedErr, err)
+			t.Errorf("Test %d failed. Expected %q but got %q", i, d.expectedErr, err)
 		}
 	}
 }
@@ -639,7 +639,7 @@ func TestWriteToDisk(t *testing.T) {
 		}
 		contents, e := ioutil.ReadFile(d.filename)
 		if e != nil {
-			t.Error("Test %d failed. Could not read file %s. Reason: %s\n", i, d.filename, e)
+			t.Errorf("Test %d failed. Could not read file %s. Reason: %s\n", i, d.filename, e)
 		}
 		if randomString != string(contents) {
 			t.Errorf("Test %d failed. Expected contents %q but got %q", i, randomString, string(contents))
diff --git a/hugolib/page.go b/hugolib/page.go
index 7aec841a0..105a5144b 100644
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -199,12 +199,12 @@ func (p *Page) setSummary() {
 
 func (p *Page) renderBytes(content []byte) []byte {
 	return helpers.RenderBytes(
-		helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),
+		&helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),
 			DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})
 }
 
 func (p *Page) renderContent(content []byte) []byte {
-	return helpers.RenderBytesWithTOC(helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),
+	return helpers.RenderBytesWithTOC(&helpers.RenderingContext{Content: content, PageFmt: p.guessMarkupType(),
 		DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})
 }
 
diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 08a48d98b..f1be54e2a 100644
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -201,7 +201,7 @@ func renderShortcode(sc shortcode, p *Page, t tpl.Template) string {
 		}
 
 		if sc.doMarkup {
-			newInner := helpers.RenderBytes(helpers.RenderingContext{
+			newInner := helpers.RenderBytes(&helpers.RenderingContext{
 				Content: []byte(inner), PageFmt: p.guessMarkupType(),
 				DocumentId: p.UniqueId(), Config: p.getRenderingConfig()})
 
diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 871a53a00..848ead7e6 100644
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -230,7 +230,7 @@ func TestTargetPath(t *testing.T) {
 		}
 
 		if p.Section() != test.expectedSection {
-			t.Errorf("%s => p.Section expected: %s, got: %s", test.doc, test.expectedSection, p.Section)
+			t.Errorf("%s => p.Section expected: %s, got: %s", test.doc, test.expectedSection, p.Section())
 		}
 	}
 }
diff --git a/tpl/template.go b/tpl/template.go
index 083603500..231946b34 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -835,7 +835,7 @@ func Highlight(in interface{}, lang string) template.HTML {
 }
 
 func Markdownify(text string) template.HTML {
-	return template.HTML(helpers.RenderBytes(helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}))
+	return template.HTML(helpers.RenderBytes(&helpers.RenderingContext{Content: []byte(text), PageFmt: "markdown"}))
 }
 
 func refPage(page interface{}, ref, methodName string) template.HTML {
diff --git a/tpl/template_test.go b/tpl/template_test.go
index 110f6742c..000a4870d 100644
--- a/tpl/template_test.go
+++ b/tpl/template_test.go
@@ -941,7 +941,7 @@ func TestSafeHtml(t *testing.T) {
 	} {
 		tmpl, err := template.New("test").Parse(this.tmplStr)
 		if err != nil {
-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)
+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)
 			continue
 		}
 
@@ -976,7 +976,7 @@ func TestSafeHtmlAttr(t *testing.T) {
 	} {
 		tmpl, err := template.New("test").Parse(this.tmplStr)
 		if err != nil {
-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)
+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)
 			continue
 		}
 
@@ -1011,7 +1011,7 @@ func TestSafeCss(t *testing.T) {
 	} {
 		tmpl, err := template.New("test").Parse(this.tmplStr)
 		if err != nil {
-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)
+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)
 			continue
 		}
 
@@ -1046,7 +1046,7 @@ func TestSafeUrl(t *testing.T) {
 	} {
 		tmpl, err := template.New("test").Parse(this.tmplStr)
 		if err != nil {
-			t.Errorf("[%d] unable to create new html template %q: %s", this.tmplStr, err)
+			t.Errorf("[%d] unable to create new html template %q: %s", i, this.tmplStr, err)
 			continue
 		}