diff --git a/os_test.go b/os_test.go
deleted file mode 100644
index c0effdc2b..000000000
--- a/os_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package common
-
-import (
-	"os"
-	"syscall"
-	"testing"
-)
-
-func TestSIGHUP(t *testing.T) {
-
-	// First, create an AutoFile writing to a tempfile dir
-	file, name := Tempfile("sighup_test")
-	err := file.Close()
-	if err != nil {
-		t.Fatalf("Error creating tempfile: %v", err)
-	}
-	// Here is the actual AutoFile
-	af, err := OpenAutoFile(name)
-	if err != nil {
-		t.Fatalf("Error creating autofile: %v", err)
-	}
-
-	// Write to the file.
-	_, err = af.Write([]byte("Line 1\n"))
-	if err != nil {
-		t.Fatalf("Error writing to autofile: %v", err)
-	}
-	_, err = af.Write([]byte("Line 2\n"))
-	if err != nil {
-		t.Fatalf("Error writing to autofile: %v", err)
-	}
-
-	// Send SIGHUP to self.
-	syscall.Kill(syscall.Getpid(), syscall.SIGHUP)
-
-	// Move the file over
-	err = os.Rename(name, name+"_old")
-	if err != nil {
-		t.Fatalf("Error moving autofile: %v", err)
-	}
-
-	// Write more to the file.
-	_, err = af.Write([]byte("Line 3\n"))
-	if err != nil {
-		t.Fatalf("Error writing to autofile: %v", err)
-	}
-	_, err = af.Write([]byte("Line 4\n"))
-	if err != nil {
-		t.Fatalf("Error writing to autofile: %v", err)
-	}
-	err = af.Close()
-	if err != nil {
-		t.Fatalf("Error closing autofile")
-	}
-
-	// Both files should exist
-	if body := MustReadFile(name + "_old"); string(body) != "Line 1\nLine 2\n" {
-		t.Errorf("Unexpected body %s", body)
-	}
-	if body := MustReadFile(name); string(body) != "Line 3\nLine 4\n" {
-		t.Errorf("Unexpected body %s", body)
-	}
-
-}
diff --git a/service.go b/service.go
index 7336446ff..e2d31925b 100644
--- a/service.go
+++ b/service.go
@@ -158,7 +158,7 @@ func (bs *BaseService) IsRunning() bool {
 	return atomic.LoadUint32(&bs.started) == 1 && atomic.LoadUint32(&bs.stopped) == 0
 }
 
-func (bs *QuitService) Wait() {
+func (bs *BaseService) Wait() {
 	<-bs.Quit
 }