Various test file cleanups, including using <servercmd> instead of writing

directly to ftpserver.cmd and removing unneeded empty sections.

tests/data/test147

@@ -4,6 +4,10 @@
 <data>
 foo
 </data>
+<servercmd>
+REPLY CWD 550 I won't allow this on my server
+COUNT CWD 1
+</servercmd>
 </reply>
 
 # Client-side
@@ -17,10 +21,6 @@ FTP with --ftp-create-dirs (failing CWD)
  <command>
 ftp://%HOSTIP:%FTPPORT/first/dir/here/147 --ftp-create-dirs
 </command>
-<file name="log/ftpserver.cmd">
-REPLY CWD 550 I won't allow this on my server
-COUNT CWD 1
-</file>
 </client>
 
 # Verify data after the test has been "shot"