diff --git a/gov2/demotools/filesystem.go b/gov2/demotools/filesystem.go
index 096fc881203..f275b8dac50 100644
--- a/gov2/demotools/filesystem.go
+++ b/gov2/demotools/filesystem.go
@@ -42,7 +42,7 @@ func (filesystem FileSystem) OpenFile(filename string) (io.ReadWriteCloser, erro
 
 // CloseFile closes the provided file.
 func (filesystem FileSystem) CloseFile(file io.ReadWriteCloser) {
-	defer file.Close()
+	file.Close()
 }
 
 // MockFileSystem is a mock version of IFileSystem for testing.
@@ -69,5 +69,5 @@ func (filesystem MockFileSystem) OpenFile(_ string) (io.ReadWriteCloser, error)
 
 // CloseFile closes the io.ReadWriteCloser provided on object creation.
 func (filesystem MockFileSystem) CloseFile(_ io.ReadWriteCloser) {
-	defer filesystem.mockfile.Close()
+	filesystem.mockfile.Close()
 }
diff --git a/gov2/demotools/filesystem_test.go b/gov2/demotools/filesystem_test.go
index 078bb1ce8c0..58b89b2ee86 100644
--- a/gov2/demotools/filesystem_test.go
+++ b/gov2/demotools/filesystem_test.go
@@ -20,12 +20,13 @@ func TestNewStandardFileSystemGwd(t *testing.T) {
 func TestNewStandardFileSystemFileIO(t *testing.T) {
 	filesystem := NewStandardFileSystem()
 	filename := "test.txt"
-	os.Create(filename)
-	file, err := filesystem.OpenFile(filename)
+	file, err := os.Create(filename)
+	fsFile, err := filesystem.OpenFile(filename)
 	if err != nil {
 		t.Errorf("NewStandardFileSystemFileInteraction(): error opening file: %v", err)
 	}
-	filesystem.CloseFile(file)
+	filesystem.CloseFile(fsFile)
+	file.Close()
 	err = os.Remove(filename)
 	if err != nil {
 		t.Errorf("NewStandardFileSystemFileInteraction(): error removing file: %v", err)
@@ -48,6 +49,7 @@ func TestNewMockFileSystem(t *testing.T) {
 		t.Errorf("NewMockFileSystem(): error opening file: %v", fErr)
 	}
 	filesystem.CloseFile(mockFile)
+	file.Close()
 	err = os.Remove(filename)
 	if err != nil {
 		t.Errorf("NewMockFileSystem(): error removing file: %v", err)
diff --git a/gov2/demotools/mocks.go b/gov2/demotools/mocks.go
index eced84bccbb..da0f10542e9 100644
--- a/gov2/demotools/mocks.go
+++ b/gov2/demotools/mocks.go
@@ -47,7 +47,7 @@ func (mock *MockQuestioner) AskFloat64(question string, validators ...IAnswerVal
 
 func (mock *MockQuestioner) AskChoice(question string, choices []string) int {
 	answerInt, _ := strconv.Atoi(mock.Next(question))
-	return answerInt
+	return answerInt - 1
 }
 
 func (mock *MockQuestioner) AskPassword(question string, minLength int) string {