diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3cc4c37e..8960475a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby and install gems
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3.0'
+          ruby-version: '3.3.5'
           bundler-cache: true
 
       - name: Set up Python 3.11
@@ -86,7 +86,7 @@ jobs:
       - name: Run tests
         run: |
           echo $PATH
-          WHATSOPT_COVERALLS=1 bundle exec rails test
+          WHATSOPT_COVERALLS=1 bundle exec rails test --verbose
 
       - name: Coveralls 
         uses: coverallsapp/github-action@v2
diff --git a/VERSION b/VERSION
index 34aae156..6bae5402 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.31.0
+1.31.1
diff --git a/app/lib/whats_opt/service_proxy.rb b/app/lib/whats_opt/service_proxy.rb
index 0fd7579a..a8f9e1c3 100644
--- a/app/lib/whats_opt/service_proxy.rb
+++ b/app/lib/whats_opt/service_proxy.rb
@@ -61,6 +61,7 @@ def self.shutdown_server(host: DEFAULT_HOST, port: DEFAULT_PORT)
       Rails.logger.warn e
     else
       transport.close()
+      self.kill_server(@pid)
     end
 
     def self.kill_server(pid)
diff --git a/test/lib/whats_opt/openmdao_generator_test.rb b/test/lib/whats_opt/openmdao_generator_test.rb
index 7a877563..7ddf0e71 100644
--- a/test/lib/whats_opt/openmdao_generator_test.rb
+++ b/test/lib/whats_opt/openmdao_generator_test.rb
@@ -236,8 +236,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       ok, log = @ogen_remote.run
       assert ok
       assert log
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end
 
@@ -252,8 +252,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       ok, log = @ogen_remote.run
       assert ok
       assert log
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end
 
@@ -271,8 +271,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       assert log
       assert File.exist?("cicav_doe.sqlite")
       File.delete("cicav_doe.sqlite") if File.exist?("cicav_doe.sqlite")
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end
 
@@ -291,8 +291,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       assert log
       assert File.exist?("singleton_uq_doe.sqlite")
       File.delete("singleton_uq_doe.sqlite") if File.exist?("singleton_uq_doe.sqlite")
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end
 
@@ -375,8 +375,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       ok, log = @ogen_remote.run
       assert ok
       assert log
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end
 
@@ -393,8 +393,8 @@ def _assert_file_generation(expected, with_server: false, with_egmdo: false, wit
       ok, log = @ogen_remote.run
       assert ok
       assert log
-      Process.kill("TERM", pid)
-      Process.waitpid pid
+      Process.kill("KILL", pid)
+      Process.waitpid pid; sleep(1)
     end
   end