diff --git a/ChangeLog b/ChangeLog
index b579b9525f..00d550753f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Sep 27 15:58:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+
+	* lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+
+	* lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
+	  a change to reset logging severity threshold.
+
+	* test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
+	  silent.
+
 Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_fileutils.rb: clear all errors on Windows.
diff --git a/MANIFEST b/MANIFEST
index 5cb6a4f2ac..0ac522c09a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -626,6 +626,7 @@ test/ruby/test_defined.rb
 test/ruby/test_eval.rb
 test/ruby/test_exception.rb
 test/ruby/test_float.rb
+test/ruby/test_file.rb
 test/ruby/test_gc.rb
 test/ruby/test_hash.rb
 test/ruby/test_ifunless.rb
diff --git a/lib/soap/rpc/cgistub.rb b/lib/soap/rpc/cgistub.rb
index f016e31057..fee3474030 100644
--- a/lib/soap/rpc/cgistub.rb
+++ b/lib/soap/rpc/cgistub.rb
@@ -96,7 +96,7 @@ class CGIStub < Logger::Application
   def initialize(appname, default_namespace)
     super(appname)
     set_log(STDERR)
-    self.level = INFO
+    self.level = ERROR
     @default_namespace = default_namespace
     @router = SOAP::RPC::Router.new(appname)
     @remote_user = ENV['REMOTE_USER'] || 'anonymous'
diff --git a/lib/soap/rpc/standaloneServer.rb b/lib/soap/rpc/standaloneServer.rb
index bc8ab18f4c..346d6e196b 100644
--- a/lib/soap/rpc/standaloneServer.rb
+++ b/lib/soap/rpc/standaloneServer.rb
@@ -50,18 +50,12 @@ class StandaloneServer < Logger::Application
 
   def initialize(app_name, namespace, host = "0.0.0.0", port = 8080)
     super(app_name)
-    @logdev = Logger.new(STDERR)
-    @logdev.level = INFO
     @namespace = namespace
-    @server = WEBrick::HTTPServer.new(
-      :BindAddress => host,
-      :Logger => logdev,
-      :AccessLog => [[logdev, WEBrick::AccessLog::COMBINED_LOG_FORMAT]],
-      :Port => port
-    )
+    @host = host
+    @port = port
+    @server = nil
     @soaplet = ::SOAP::RPC::SOAPlet.new
     on_init
-    @server.mount('/', @soaplet)
   end
 
   def on_init
@@ -107,6 +101,13 @@ class StandaloneServer < Logger::Application
 private
 
   def run
+    @server = WEBrick::HTTPServer.new(
+      :BindAddress => @host,
+      :Logger => @log,
+      :AccessLog => [],
+      :Port => @port
+    )
+    @server.mount('/', @soaplet)
     @server.start
   end
 end
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index e14dbf5daa..528b3e2d49 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -14,10 +14,11 @@ module Calc
 class TestCalc < Test::Unit::TestCase
   def setup
     @server = CalcServer.new(self.class.name, nil, '0.0.0.0', 7000)
+    @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
     @calc = SOAP::RPC::Driver.new('http://localhost:7000/', 'http://tempuri.org/calcService')
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index 0e84ca390b..776151ff35 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -14,10 +14,11 @@ module Calc
 class TestCalc2 < Test::Unit::TestCase
   def setup
     @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000)
+    @server.level = Logger::Severity::FATAL
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
     @var = SOAP::RPC::Driver.new('http://localhost:7000/', 'http://tempuri.org/calcService')
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 6c89d46c12..6d1204d48c 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'soap/rpc/driver'
+require 'logger'
 require 'webrick'
 
 
@@ -9,9 +10,13 @@ module Calc
 
 class TestCalcCGI < Test::Unit::TestCase
   def setup
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::FATAL
     @server = WEBrick::HTTPServer.new(
       :BindAddress => "0.0.0.0",
+      :Logger => logger,
       :Port => 8808,
+      :AccessLog => [],
       :DocumentRoot => File.dirname(File.expand_path(__FILE__)),
       :CGIPathEnv => ENV['PATH']
     )
diff --git a/test/soap/helloworld/hw_s.rb b/test/soap/helloworld/hw_s.rb
index b917f72fc0..970c76a1bd 100644
--- a/test/soap/helloworld/hw_s.rb
+++ b/test/soap/helloworld/hw_s.rb
@@ -2,7 +2,6 @@ require 'soap/rpc/standaloneServer'
 
 class HelloWorldServer < SOAP::RPC::StandaloneServer
   def on_init
-    @log.level = Logger::Severity::DEBUG
     add_method(self, 'hello_world', 'from')
   end
 
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index 0aa552e4a8..3f12bf4a20 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -14,10 +14,11 @@ module HelloWorld
 class TestHelloWorld < Test::Unit::TestCase
   def setup
     @server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', 2000)
+    @server.level = Logger::Severity::UNKNOWN
     @t = Thread.new {
       @server.start
     }
-    while @server.server.status != :Running
+    while @server.server.nil? or @server.server.status != :Running
       sleep 0.1
     end
     @client = SOAP::RPC::Driver.new('http://localhost:2000/', 'urn:hws')