diff --git a/notes.txt b/notes.txt
index 97aa8ff72..cc7d323c8 100644
--- a/notes.txt
+++ b/notes.txt
@@ -15,6 +15,14 @@ Todo
   * Make a fs.Errorf and count errors and log them at a different level
   * Add max object size to fs metadata - 5GB for swift, infinite for local, ? for s3
     * tie into -max-size flag
+  * FIXME Make NewFs to return err.IsAnObject so can put the LimitedFs
+    creation in common code? Or try for as much as possible?
+  * FIXME Account all the transactons (ls etc) using a different
+    Roundtripper wrapper which wraps the transactions?
+  * FIXME write tests for local file system
+  * FIXME implement tests for single file operations in rclonetest
+  * Need to make directory objects otherwise can't upload an empty directory
+    * Or could upload empty directories only?
 
 Ideas
   * could do encryption - put IV into metadata?
@@ -23,21 +31,9 @@ Ideas
   * support
       * sftp
       * scp
-      * Google cloud storage: https://developers.google.com/storage/
-        * http://godoc.org/code.google.com/p/google-api-go-client/storage/v1
-        * Has MD5, can't set updated time so will need to use metadata
-        * metadata returned with object head and easy to update
       * rsync over ssh
-      * dropbox: https://github.com/stacktic/dropbox
-        * No MD5s
-        * Can't set modtime
-  * control times sync (which is slow) with -a --archive flag?
-
-Need to make directory objects otherwise can't upload an empty directory
-  * Or could upload empty directories only?
-  * Can't purge a local filesystem because it leaves the directories behind
-
-Copying a single file? Or maybe with a glob pattern? Could do with LimitedFs
+  * control times sync (which is slow with some remotes) with -a --archive flag?
+  * Copy a glob pattern - could do with LimitedFs
 
 s3
   * Can maybe set last modified?
@@ -50,14 +46,9 @@ Bugs
   * When doing copy it recurses the whole of the destination FS which isn't necessary
 
 Making a release
-  * go build ./...
-  * cd rclonetest
-  * go build
-  * ./rclonetest memstore:
-  * ./rclonetest s3:
-  * ./rclonetest drive2:
-  * ./rclonetest /tmp/z
-  * cd ..
+  * go install -v ./...
+  * go test ./...
+  * rclonetest/test.sh
   * make tag
   * edit README.md
   * git commit fs/version.go README.md docs/content/downloads.md
diff --git a/rclonetest/rclonetest.go b/rclonetest/rclonetest.go
index e838e9050..50cb4a69a 100644
--- a/rclonetest/rclonetest.go
+++ b/rclonetest/rclonetest.go
@@ -29,6 +29,7 @@ import (
 var (
 	localName, remoteName string
 	version               = pflag.BoolP("version", "V", false, "Print the version number")
+	subDir                = pflag.BoolP("subdir", "S", false, "Test with a sub directory")
 )
 
 // Represents an item for checking
@@ -306,11 +307,19 @@ func TestLsd(flocal, fremote fs.Fs) {
 func TestCheck(flocal, fremote fs.Fs) {
 }
 
-func TestPurge(flocal, fremote fs.Fs) {
+func TestPurge(fremote fs.Fs) {
 	err := fs.Purge(fremote)
 	if err != nil {
 		log.Fatalf("Purge failed: %v", err)
 	}
+	unexpected := 0
+	for obj := range fremote.List() {
+		unexpected++
+		log.Printf("Found unexpected item %s", obj.Remote())
+	}
+	if unexpected != 0 {
+		log.Fatalf("exiting as found %d unexpected items", unexpected)
+	}
 }
 
 func TestRmdir(flocal, fremote fs.Fs) {
@@ -364,6 +373,15 @@ func main() {
 		remoteName += "/"
 	}
 	remoteName += RandomString(32)
+	var parentRemote fs.Fs
+	if *subDir {
+		var err error
+		parentRemote, err = fs.NewFs(remoteName)
+		if err != nil {
+			log.Fatalf("Failed to make parent %q: %v", remoteName, err)
+		}
+		remoteName += "/" + RandomString(8)
+	}
 	log.Printf("Testing with remote %q", remoteName)
 	var err error
 	localName, err = ioutil.TempDir("", "rclone")
@@ -389,9 +407,13 @@ func main() {
 	TestLs(flocal, fremote)
 	TestLsd(flocal, fremote)
 	TestCheck(flocal, fremote)
-	TestPurge(flocal, fremote)
+	TestPurge(fremote)
 	//TestRmdir(flocal, fremote)
 
+	if parentRemote != nil {
+		TestPurge(parentRemote)
+	}
+
 	cleanTempDir()
 	log.Printf("Tests OK")
 }
diff --git a/rclonetest/test.sh b/rclonetest/test.sh
new file mode 100755
index 000000000..4eb6eb606
--- /dev/null
+++ b/rclonetest/test.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+go install
+
+REMOTES="
+memstore:
+s3:
+drive2:
+gcs:
+dropbox:
+/tmp/z
+"
+
+function test_remote {
+    args=$@
+    rclonetest $args || {
+        echo "*** rclonetest $args FAILED ***"
+        exit 1
+    }
+}
+
+for remote in $REMOTES; do
+    test_remote $remote
+    test_remote --subdir $remote
+done