diff --git a/examples/fs.go b/examples/fs.go
index a5fda62..9c589cd 100644
--- a/examples/fs.go
+++ b/examples/fs.go
@@ -39,7 +39,7 @@ type Datastore struct {
 // NewDatastore returns a new fs Datastore at given `path`
 func NewDatastore(path string) (ds.Datastore, error) {
 	if !isDir(path) {
-		return nil, fmt.Errorf("Failed to find directory at: %v (file? perms?)", path)
+		return nil, fmt.Errorf("failed to find directory at: %v (file? perms?)", path)
 	}
 
 	return &Datastore{path: path}, nil
@@ -104,10 +104,9 @@ func (d *Datastore) Delete(key ds.Key) (err error) {
 
 // Query implements Datastore.Query
 func (d *Datastore) Query(q query.Query) (query.Results, error) {
-
 	results := make(chan query.Result)
 
-	walkFn := func(path string, info os.FileInfo, err error) error {
+	walkFn := func(path string, info os.FileInfo, _ error) error {
 		// remove ds path prefix
 		relPath, err := filepath.Rel(d.path, path)
 		if err == nil {
@@ -115,9 +114,7 @@ func (d *Datastore) Query(q query.Query) (query.Results, error) {
 		}
 
 		if !info.IsDir() {
-			if strings.HasSuffix(path, ObjectKeySuffix) {
-				path = path[:len(path)-len(ObjectKeySuffix)]
-			}
+			path = strings.TrimSuffix(path, ObjectKeySuffix)
 			var result query.Result
 			key := ds.NewKey(path)
 			result.Entry.Key = key.String()
diff --git a/keytransform/keytransform_test.go b/keytransform/keytransform_test.go
index da2ea6f..c799c92 100644
--- a/keytransform/keytransform_test.go
+++ b/keytransform/keytransform_test.go
@@ -89,15 +89,15 @@ func (ks *DSSuite) TestBasic(c *C) {
 	c.Log("listA: ", listA)
 	c.Log("listB: ", listB)
 
-	if err := ktds.Check(); err != dstest.TestError {
+	if err := ktds.Check(); err != dstest.ErrTest {
 		c.Errorf("Unexpected Check() error: %s", err)
 	}
 
-	if err := ktds.CollectGarbage(); err != dstest.TestError {
+	if err := ktds.CollectGarbage(); err != dstest.ErrTest {
 		c.Errorf("Unexpected CollectGarbage() error: %s", err)
 	}
 
-	if err := ktds.Scrub(); err != dstest.TestError {
+	if err := ktds.Scrub(); err != dstest.ErrTest {
 		c.Errorf("Unexpected Scrub() error: %s", err)
 	}
 }
diff --git a/namespace/namespace_test.go b/namespace/namespace_test.go
index 9062ea0..95897ba 100644
--- a/namespace/namespace_test.go
+++ b/namespace/namespace_test.go
@@ -134,15 +134,15 @@ func (ks *DSSuite) TestQuery(c *C) {
 		c.Check(string(ent.Value), Equals, string(expect[i].Value))
 	}
 
-	if err := nsds.Check(); err != dstest.TestError {
+	if err := nsds.Check(); err != dstest.ErrTest {
 		c.Errorf("Unexpected Check() error: %s", err)
 	}
 
-	if err := nsds.CollectGarbage(); err != dstest.TestError {
+	if err := nsds.CollectGarbage(); err != dstest.ErrTest {
 		c.Errorf("Unexpected CollectGarbage() error: %s", err)
 	}
 
-	if err := nsds.Scrub(); err != dstest.TestError {
+	if err := nsds.Scrub(); err != dstest.ErrTest {
 		c.Errorf("Unexpected Scrub() error: %s", err)
 	}
 }
diff --git a/test/test_util.go b/test/test_util.go
index fc56221..3393203 100644
--- a/test/test_util.go
+++ b/test/test_util.go
@@ -10,9 +10,7 @@ import (
 	dstore "github.com/ipfs/go-datastore"
 )
 
-var (
-	TestError = errors.New("test error")
-)
+var ErrTest = errors.New("test error")
 
 func RunBatchTest(t *testing.T, ds dstore.Batching) {
 	batch, err := ds.Batch()
@@ -164,21 +162,21 @@ func NewTestDatastore(testErrors bool) *testDatastore {
 
 func (d *testDatastore) Check() error {
 	if d.testErrors {
-		return TestError
+		return ErrTest
 	}
 	return nil
 }
 
 func (d *testDatastore) Scrub() error {
 	if d.testErrors {
-		return TestError
+		return ErrTest
 	}
 	return nil
 }
 
 func (d *testDatastore) CollectGarbage() error {
 	if d.testErrors {
-		return TestError
+		return ErrTest
 	}
 	return nil
 }