diff --git a/ChangeLog b/ChangeLog
index b8a311b..c021313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 yapfaq 1.1.0 (unreleased)
+* --test: Set Supersedes and don't modify Message-ID if -o is set.
+* --test: Force -o if -n is not set.
 
-
-yapfaq 1.0.1 (unreleased)
+yapfaq 1.0.1 (2025-01-24)
 * Add %t placeholder for Message-ID (feature parity with 0.9).
 * Remove debugging code.
 
diff --git a/bin/yapfaq.pl b/bin/yapfaq.pl
index 080dd3e..be517c0 100755
--- a/bin/yapfaq.pl
+++ b/bin/yapfaq.pl
@@ -19,7 +19,7 @@
 # It can be redistributed and/or modified under the same terms under 
 # which Perl itself is published.
 
-my $VERSION = "1.1.0-unreleased";
+my $VERSION = "1.1.0-pre";
 (my $NAME = $0) =~ s#^.*/##;
 
 use utf8;
@@ -112,6 +112,9 @@ if ($OptSimulation) {
   $Config{'verbose'} = 1;
 }
 
+# -t implies -o if -n is not set
+$OptOutput = 1 if $OptTest && !$OptNewsgroup;
+
 ### create list of @Projects from $Config{'datadir'} unless -p is set
 my @Projects;
 if (!$OptProject) {
@@ -475,7 +478,7 @@ sub BuildPosting {
       $_ =~ s/\%p/$$/g;
       $_ =~ s/\%t/$TimeStamp/g;
       # add random part in test mode
-      if ($OptTest) {
+      if ($OptTest && !$OptOutput) {
         my $random = sprintf("%08X", rand(0xFFFFFFFF));
         $_ =~ s/</<test-$random-/;
       }
@@ -491,7 +494,7 @@ sub BuildPosting {
     }
     # add Supersedes: if set
     if (/^Supersedes: /) {
-      if ($LastMID && !$OptTest) {
+      if ($LastMID && (!$OptTest or $OptOutput)) {
         $_= "Supersedes: $LastMID\n";
       } else {
         $_ = '';
@@ -843,7 +846,7 @@ unique I<Message-ID:> (and no I<Supersedes:> header).
 
 Don't post via NNTP, but print to STDOUT.
 
-Combine with B<--test> to avoid updating project status.
+Use B<--test> instead to avoid updating project status.
 
 Intended for testing purposes or to pipe in another program like
 I<inews> or I<tinews.pl>. If you want to pipe the output to another
@@ -861,20 +864,18 @@ Display this man page and exit.
 =item B<-s>, B<--simulation>
 
 Simulation mode. Don't post, just show which projects would be due.
-Implies B<--test> and B<--verbose>.
+Implies B<--test> (without B<--output>) and B<--verbose>.
 
 Can be combined with B<--project> to show if just one project is due.
 
 =item B<-t>, B<--test>
 
 Test mode. Don't update project status (time and Message-ID of last
-posting), dont' add a I<Supersedes:> header and modify the
-I<Message-ID:> with a random part.
+posting); if project is posted to Usenet, dont' add a I<Supersedes:>
+header and modify the I<Message-ID:> with a random part.
 
-The text(s) will still be posted if due or forced by B<--force>.
-
-Combine with B<--output> to redirect output to STDOUT or with
-B<--newsgroup> to override the I<Newsgroups:> header.
+Implies B<--output> (to redirect output to STDOUT) as long as
+B<--newsgroup> (to override the I<Newsgroups:> header) is not set.
 
 =item B<-V>, B<--version>
 
@@ -911,16 +912,16 @@ that are not:
 Do a test run of your I<example> text and and print it on STDOUT
 (whether ist is due or not):
 
-    yapfaq.pl -t -f -o -p example
-    (or yapfaq.pl -tfop example)
+    yapfaq.pl -t -f -p example
+    (or yapfaq.pl -tfp example)
 
 The same, with debugging output (add "-d"):
 
-    yapfaq.pl -tfdop example
+    yapfaq.pl -tfdp example
 
 Force a test post of your I<example> text to I<alt.test>, even if
-the text is not due to be posted (same as before, just replace "-o"
-by "-n alt-test"):
+the text is not due to be posted (same as before, just add
+"-n alt-test"):
 
     yapfaq.pl -t -f -p example -n alt.test