Fixed finish_tournament_204.rake

README.md

@@ -206,4 +206,7 @@ The application has been migrated from using vanilla JavaScript to Hotwired Stim
 - `app/assets/javascripts/controllers/` - Contains all Stimulus controllers
 - `app/assets/javascripts/application.js` - Registers and loads all controllers
 
-The importmap configuration in `config/importmap.rb` handles the loading of all JavaScript dependencies including Stimulus controllers.
+The importmap configuration in `config/importmap.rb` handles the loading of all JavaScript dependencies including Stimulus controllers.
+
+# Using Repomix with LLMs
+`npx repomix app test`

app/jobs/advance_wrestler_job.rb

@@ -2,11 +2,6 @@ class AdvanceWrestlerJob < ApplicationJob
   queue_as :default
   
   def perform(wrestler, match)
-    # Add a small delay to increase chance of transaction commit
-    # without this some matches were getting a deserialization error when running the rake task
-    # to finish tournaments
-    sleep(0.5) unless Rails.env.test?
-
     # Get tournament from wrestler
     tournament = wrestler.tournament
     

app/models/match.rb

@@ -10,12 +10,17 @@ class Match < ApplicationRecord
 	# Callback to update finished_at when a match is finished
 	before_save :update_finished_at
 
-	after_update :after_finished_actions, if: -> { 
-		saved_change_to_finished? || 
-		saved_change_to_winner_id? || 
-		saved_change_to_win_type? || 
-		saved_change_to_score? || 
-		saved_change_to_overtime_type?
+	# Enqueue advancement and related actions after the DB transaction has committed.
+	# Using after_commit ensures any background jobs enqueued inside these callbacks
+	# will see the committed state of the match (e.g. finished == 1). Enqueuing
+	# jobs from after_update can cause jobs to run before the transaction commits,
+	# which leads to jobs observing stale data and not performing advancement.
+	after_commit :after_finished_actions, on: :update, if: -> {
+	  saved_change_to_finished? ||
+	  saved_change_to_winner_id? ||
+	  saved_change_to_win_type? ||
+	  saved_change_to_score? ||
+	  saved_change_to_overtime_type?
 	}
 
 	def after_finished_actions
@@ -30,7 +35,8 @@ class Match < ApplicationRecord
 			self.mat.assign_next_match
 		end
 		advance_wrestlers
-		calculate_school_points
+		# School point calculation has move to the end of advance wrestler
+		# calculate_school_points
 	  end
 	end
     

app/models/tournament.rb

@@ -157,10 +157,10 @@ class Tournament < ApplicationRecord
   	def double_elim_number_of_wrestlers_error
   		error_string = ""
         if self.tournament_type == "Double Elimination 1-6" or self.tournament_type == "Double Elimination 1-8"
-        	weights_with_too_many_wrestlers = weights.select{|w| w.wrestlers.size > 32}
+        	weights_with_too_many_wrestlers = weights.select{|w| w.wrestlers.size > 64}
         	weight_with_too_few_wrestlers = weights.select{|w| w.wrestlers.size < 4}
         	weights_with_too_many_wrestlers.each do |weight|
-        		error_string = error_string + " The weight class #{weight.max} has more than 16 wrestlers."
+        		error_string = error_string + " The weight class #{weight.max} has more than 64 wrestlers."
         	end
         	weight_with_too_few_wrestlers.each do |weight|
         		error_string = error_string + " The weight class #{weight.max} has less than 4 wrestlers."

app/services/bracket_advancement/advance_wrestler.rb

@@ -12,12 +12,14 @@ class AdvanceWrestler
     end
 
     def advance_raw
-      
+      @last_match.reload
+      @wrestler.reload
       if @last_match && @last_match.finished?
         pool_to_bracket_advancement if @tournament.tournament_type == "Pool to bracket"
         ModifiedDoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type.include? "Modified 16 Man Double Elimination"
         DoubleEliminationAdvance.new(@wrestler, @last_match).bracket_advancement if @tournament.tournament_type.include? "Regular Double Elimination"
       end
+      @wrestler.school.calculate_score
     end
     
     def pool_to_bracket_advancement

app/services/tournament_services/double_elimination_generate_loser_names.rb

@@ -202,4 +202,4 @@ class DoubleEliminationGenerateLoserNames
       return "Conso Round of #{participants}#{suffix}"
     end
   end
-end
+end

app/views/layouts/_header.html.erb

@@ -19,9 +19,9 @@
                   <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= current_user.email %>
                   <span class="caret"></span></a>
                   <ul class="dropdown-menu">
-                    <li><%= link_to "Log out", logout_path, method: :delete %></li>
+                    <li><%= button_to "Log out", logout_path, method: :delete, class: 'btn btn-link', form: { class: 'navbar-logout-form' } %></li>
                     <li><%= link_to "Edit profile", edit_user_path(current_user) %></li>
-                    <li><%= link_to "My tournaments and schools", "/static_pages/my_tournaments" %></li> 
+                    <li><%= link_to "My tournaments and schools", "/static_pages/my_tournaments" %></li>
                   </ul>
                 </li>
             <% else %>

lib/tasks/finish_tournament_204.rake

@@ -27,18 +27,19 @@ namespace :tournament do
       )
 
       GenerateTournamentMatches.new(@tournament).generate
-      sleep(10)
+      sleep(60)
       while @tournament.reload.curently_generating_matches == 1
         puts "Waiting for tournament to finish generating matches..."
         sleep(5)
+        @tournament.reload
       end
   
+      sleep(10)
       @tournament.reload # Ensure matches association is fresh before iterating
-      @tournament.matches.sort_by(&:bout_number).each do |match|
-        match.reload
-        if match.loser1_name != "BYE" and match.loser2_name != "BYE"
+      @tournament.matches.reload.sort_by(&:bout_number).each do |match|
+        if match.reload.loser1_name != "BYE" and match.reload.loser2_name != "BYE" and match.reload.finished != 1
             # Wait until both wrestlers are assigned
-            while match.w1.nil? || match.w2.nil?
+            while (match.w1.nil? || match.w2.nil?)
               puts "Waiting for wrestlers in match #{match.bout_number}..."
               sleep(5) # Wait for 5 seconds before checking again
               match.reload
@@ -77,6 +78,8 @@ namespace :tournament do
             # Mark match as finished
             match.finished = 1
             match.save!
+            # sleep to prevent mysql locks when assign_next_match to a mat runs
+            sleep(0.5)
         end
       end
     end

public/ads.txt

@@ -0,0 +1 @@
+pub-6845455733812572

test/integration/double_elimination_64_man_1_8_run_through_test.rb

@@ -2,336 +2,376 @@ require 'test_helper'
 
 class DoubleEliminationSixtyFourManEightPlacesRunThrough < ActionDispatch::IntegrationTest
   def setup
-    create_double_elim_tournament_single_weight(62, "Regular Double Elimination 1-8")
-    @matches = @tournament.matches.reload
   end
 
-  def simulate_match(winner_name, match)
-    wrestler = @tournament.wrestlers.find_by(name: winner_name)
-    match.update!(
-      winner_id: wrestler.id,
-      finished: 1,
-      win_type: "Decision",
-      score: "1-0"
-    )
+  def winner_by_name(winner_name,match)
+    wrestler = @tournament.weights.first.wrestlers.select{|w| w.name == winner_name}.first
+    match.winner_id = wrestler.id
+    match.finished = 1
+    match.win_type = "Decision"
+    match.score = "1-0"
+    match.save
   end
 
-  test "32 man double elimination place 1-8" do
+  test "64 man double elimination place 1-8" do
     create_double_elim_tournament_single_weight(62, "Regular Double Elimination 1-8")
     matches = @tournament.matches.reload
-
-    bracket_r64 = matches.select{|m| m.bracket_position == "Bracket Round of 64"}
-    winner_by_name("Test32", bracket_r64.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test48", bracket_r64.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test16", bracket_r64.select{|m| m.bracket_position_number == 4}.first)
-
-    # Match  1  - seed  1  vs seed 64 (BYE)
-    assert matches_r64[0].wrestler1.bracket_line == 1
-    assert matches_r64[0].loser2_name == "BYE"
-
-    # Match  2  - seed 32 vs seed 33
-    assert matches_r64[1].wrestler1.bracket_line == 32
-    assert matches_r64[1].wrestler2.bracket_line == 33
-
-    # Match  3  - seed 17 vs seed 48
-    assert matches_r64[2].wrestler1.bracket_line == 17
-    assert matches_r64[2].wrestler2.bracket_line == 48
-
-    # Match  4  - seed 16 vs seed 49
-    assert matches_r64[3].wrestler1.bracket_line == 16
-    assert matches_r64[3].wrestler2.bracket_line == 49
-
-    # Match  5  - seed  9 vs seed 56
-    assert matches_r64[4].wrestler1.bracket_line == 9
-    assert matches_r64[4].wrestler2.bracket_line == 56
-
-    # Match  6  - seed 24 vs seed 41
-    assert matches_r64[5].wrestler1.bracket_line == 24
-    assert matches_r64[5].wrestler2.bracket_line == 41
-
-    # Match  7  - seed 25 vs seed 40
-    assert matches_r64[6].wrestler1.bracket_line == 25
-    assert matches_r64[6].wrestler2.bracket_line == 40
-
-    # Match  8  - seed  8 vs seed 57
-    assert matches_r64[7].wrestler1.bracket_line == 8
-    assert matches_r64[7].wrestler2.bracket_line == 57
-
-    # Match  9  - seed  5 vs seed 60
-    assert matches_r64[8].wrestler1.bracket_line == 5
-    assert matches_r64[8].wrestler2.bracket_line == 60
-
-    # Match 10  - seed 28 vs seed 37
-    assert matches_r64[9].wrestler1.bracket_line == 28
-    assert matches_r64[9].wrestler2.bracket_line == 37
-
-    # Match 11  - seed 21 vs seed 44
-    assert matches_r64[10].wrestler1.bracket_line == 21
-    assert matches_r64[10].wrestler2.bracket_line == 44
-
-    # Match 12  - seed 12 vs seed 53
-    assert matches_r64[11].wrestler1.bracket_line == 12
-    assert matches_r64[11].wrestler2.bracket_line == 53
-
-    # Match 13  - seed 13 vs seed 52
-    assert matches_r64[12].wrestler1.bracket_line == 13
-    assert matches_r64[12].wrestler2.bracket_line == 52
-
-    # Match 14  - seed 20 vs seed 45
-    assert matches_r64[13].wrestler1.bracket_line == 20
-    assert matches_r64[13].wrestler2.bracket_line == 45
-
-    # Match 15  - seed 29 vs seed 36
-    assert matches_r64[14].wrestler1.bracket_line == 29
-    assert matches_r64[14].wrestler2.bracket_line == 36
-
-    # Match 16  - seed  4 vs seed 61
-    assert matches_r64[15].wrestler1.bracket_line == 4
-    assert matches_r64[15].wrestler2.bracket_line == 61
-
-    # Match 17  - seed  3 vs seed 62
-    assert matches_r64[16].wrestler1.bracket_line == 3
-    assert matches_r64[16].wrestler2.bracket_line == 62
-
-    # Match 18  - seed 30 vs seed 35
-    assert matches_r64[17].wrestler1.bracket_line == 30
-    assert matches_r64[17].wrestler2.bracket_line == 35
-
-    # Match 19  - seed 19 vs seed 46
-    assert matches_r64[18].wrestler1.bracket_line == 19
-    assert matches_r64[18].wrestler2.bracket_line == 46
-
-    # Match 20  - seed 14 vs seed 51
-    assert matches_r64[19].wrestler1.bracket_line == 14
-    assert matches_r64[19].wrestler2.bracket_line == 51
-
-    # Match 21  - seed 11 vs seed 54
-    assert matches_r64[20].wrestler1.bracket_line == 11
-    assert matches_r64[20].wrestler2.bracket_line == 54
-
-    # Match 22  - seed 22 vs seed 43
-    assert matches_r64[21].wrestler1.bracket_line == 22
-    assert matches_r64[21].wrestler2.bracket_line == 43
-
-    # Match 23  - seed 27 vs seed 38
-    assert matches_r64[22].wrestler1.bracket_line == 27
-    assert matches_r64[22].wrestler2.bracket_line == 38
-
-    # Match 24  - seed  6 vs seed 59
-    assert matches_r64[23].wrestler1.bracket_line == 6
-    assert matches_r64[23].wrestler2.bracket_line == 59
-
-    # Match 25  - seed  7 vs seed 58
-    assert matches_r64[24].wrestler1.bracket_line == 7
-    assert matches_r64[24].wrestler2.bracket_line == 58
-
-    # Match 26  - seed 26 vs seed 39
-    assert matches_r64[25].wrestler1.bracket_line == 26
-    assert matches_r64[25].wrestler2.bracket_line == 39
-
-    # Match 27  - seed 23 vs seed 42
-    assert matches_r64[26].wrestler1.bracket_line == 23
-    assert matches_r64[26].wrestler2.bracket_line == 42
-
-    # Match 28  - seed 10 vs seed 55
-    assert matches_r64[27].wrestler1.bracket_line == 10
-    assert matches_r64[27].wrestler2.bracket_line == 55
-
-    # Match 29  - seed 15 vs seed 50
-    assert matches_r64[28].wrestler1.bracket_line == 15
-    assert matches_r64[28].wrestler2.bracket_line == 50
-
-    # Match 30  - seed 18 vs seed 47
-    assert matches_r64[29].wrestler1.bracket_line == 18
-    assert matches_r64[29].wrestler2.bracket_line == 47
-
-    # Match 31  - seed 31 vs seed 34
-    assert matches_r64[30].wrestler1.bracket_line == 31
-    assert matches_r64[30].wrestler2.bracket_line == 34
-
-    # Match 32  - seed  2 vs seed 63 (BYE)
-    assert matches_r64[31].wrestler1.bracket_line == 2
-    assert matches_r64[31].loser2_name == "BYE"
-
+    # BYEs are automatically advanced
+    bracket_r64 = matches.reload.select { |m| m.bracket_position == "Bracket Round of 64" }.sort_by(&:bracket_position_number)
+    # winner_by_name("Test1", bracket_r64.select{|m| m.bracket_position_number == 1}.first) # seed 1 vs 64 (BYE)
+    winner_by_name("Test32", bracket_r64.select{|m| m.bracket_position_number == 2}.first) # seed 32 vs seed 33
+    winner_by_name("Test17", bracket_r64.select{|m| m.bracket_position_number == 3}.first) # seed 17 vs seed 48
+    winner_by_name("Test49", bracket_r64.select{|m| m.bracket_position_number == 4}.first) # seed 16 vs seed 49
+    winner_by_name("Test9", bracket_r64.select{|m| m.bracket_position_number == 5}.first) # seed  9 vs seed 56
+    winner_by_name("Test24", bracket_r64.select{|m| m.bracket_position_number == 6}.first) # seed 24 vs seed 41
+    winner_by_name("Test25", bracket_r64.select{|m| m.bracket_position_number == 7}.first) # seed 25 vs seed 40
+    winner_by_name("Test8", bracket_r64.select{|m| m.bracket_position_number == 8}.first) # seed  8 vs seed 57
+    winner_by_name("Test5", bracket_r64.select{|m| m.bracket_position_number == 9}.first) # seed  5 vs seed 60
+    winner_by_name("Test37", bracket_r64.select{|m| m.bracket_position_number == 10}.first) # seed 28 vs seed 37
+    winner_by_name("Test21", bracket_r64.select{|m| m.bracket_position_number == 11}.first) # seed 21 vs seed 44
+    winner_by_name("Test12", bracket_r64.select{|m| m.bracket_position_number == 12}.first) # seed 12 vs seed 53
+    winner_by_name("Test13", bracket_r64.select{|m| m.bracket_position_number == 13}.first) # seed 13 vs seed 52
+    winner_by_name("Test20", bracket_r64.select{|m| m.bracket_position_number == 14}.first) # seed 20 vs 45
+    winner_by_name("Test29", bracket_r64.select{|m| m.bracket_position_number == 15}.first) # seed 29 vs 36
+    winner_by_name("Test4",  bracket_r64.select{|m| m.bracket_position_number == 16}.first) # seed 4 vs 61
+    winner_by_name("Test3",  bracket_r64.select{|m| m.bracket_position_number == 17}.first) # seed 3 vs 62
+    winner_by_name("Test30", bracket_r64.select{|m| m.bracket_position_number == 18}.first) # seed 30 vs 35
+    winner_by_name("Test19", bracket_r64.select{|m| m.bracket_position_number == 19}.first) # seed 19 vs 46
+    winner_by_name("Test14", bracket_r64.select{|m| m.bracket_position_number == 20}.first) # seed 14 vs 51
+    winner_by_name("Test11", bracket_r64.select{|m| m.bracket_position_number == 21}.first) # seed 11 vs 54
+    winner_by_name("Test22", bracket_r64.select{|m| m.bracket_position_number == 22}.first) # seed 22 vs 43
+    winner_by_name("Test27", bracket_r64.select{|m| m.bracket_position_number == 23}.first) # seed 27 vs 38
+    winner_by_name("Test6",  bracket_r64.select{|m| m.bracket_position_number == 24}.first) # seed 6 vs 59
+    winner_by_name("Test7",  bracket_r64.select{|m| m.bracket_position_number == 25}.first) # seed 7 vs 58
+    winner_by_name("Test26", bracket_r64.select{|m| m.bracket_position_number == 26}.first) # seed 26 vs 39
+    winner_by_name("Test23", bracket_r64.select{|m| m.bracket_position_number == 27}.first) # seed 23 vs 42
+    winner_by_name("Test10", bracket_r64.select{|m| m.bracket_position_number == 28}.first) # seed 10 vs 55
+    winner_by_name("Test15", bracket_r64.select{|m| m.bracket_position_number == 29}.first) # seed 15 vs 50
+    winner_by_name("Test18", bracket_r64.select{|m| m.bracket_position_number == 30}.first) # seed 18 vs 47
+    winner_by_name("Test31", bracket_r64.select{|m| m.bracket_position_number == 31}.first) # seed 31 vs 34
+    # BYE's auto move
+    # winner_by_name("Test2",  bracket_r64.select{|m| m.bracket_position_number == 32}.first) # seed  2 vs seed 63 (BYE)
 
     bracket_r32 = matches.select{|m| m.bracket_position == "Bracket Round of 32"}
+    assert bracket_r32.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test1"
+    assert bracket_r32.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test32"
+    winner_by_name("Test1", bracket_r32.select{|m| m.bracket_position_number == 1}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test17"
+    assert bracket_r32.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test49"
     winner_by_name("Test17", bracket_r32.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test9", bracket_r32.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test25", bracket_r32.select{|m| m.bracket_position_number == 4}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test9"
+    assert bracket_r32.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test24"
+    winner_by_name("Test24", bracket_r32.select{|m| m.bracket_position_number == 3}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test25"
+    assert bracket_r32.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test8"
+    winner_by_name("Test8", bracket_r32.select{|m| m.bracket_position_number == 4}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 5}.first.reload.wrestler1.name == "Test5"
+    assert bracket_r32.select{|m| m.bracket_position_number == 5}.first.reload.wrestler2.name == "Test37"
     winner_by_name("Test5", bracket_r32.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test12", bracket_r32.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test20", bracket_r32.select{|m| m.bracket_position_number == 7}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 6}.first.reload.wrestler1.name == "Test21"
+    assert bracket_r32.select{|m| m.bracket_position_number == 6}.first.reload.wrestler2.name == "Test12"
+    winner_by_name("Test21", bracket_r32.select{|m| m.bracket_position_number == 6}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 7}.first.reload.wrestler1.name == "Test13"
+    assert bracket_r32.select{|m| m.bracket_position_number == 7}.first.reload.wrestler2.name == "Test20"
+    winner_by_name("Test13", bracket_r32.select{|m| m.bracket_position_number == 7}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 8}.first.reload.wrestler1.name == "Test29"
+    assert bracket_r32.select{|m| m.bracket_position_number == 8}.first.reload.wrestler2.name == "Test4"
     winner_by_name("Test4", bracket_r32.select{|m| m.bracket_position_number == 8}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 9}.first.reload.wrestler1.name == "Test3"
+    assert bracket_r32.select{|m| m.bracket_position_number == 9}.first.reload.wrestler2.name == "Test30"
     winner_by_name("Test3", bracket_r32.select{|m| m.bracket_position_number == 9}.first)
-    winner_by_name("Test14", bracket_r32.select{|m| m.bracket_position_number == 10}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 10}.first.reload.wrestler1.name == "Test19"
+    assert bracket_r32.select{|m| m.bracket_position_number == 10}.first.reload.wrestler2.name == "Test14"
+    winner_by_name("Test19", bracket_r32.select{|m| m.bracket_position_number == 10}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 11}.first.reload.wrestler1.name == "Test11"
+    assert bracket_r32.select{|m| m.bracket_position_number == 11}.first.reload.wrestler2.name == "Test22"
     winner_by_name("Test11", bracket_r32.select{|m| m.bracket_position_number == 11}.first)
-    winner_by_name("Test6", bracket_r32.select{|m| m.bracket_position_number == 12}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 12}.first.reload.wrestler1.name == "Test27"
+    assert bracket_r32.select{|m| m.bracket_position_number == 12}.first.reload.wrestler2.name == "Test6"
+    winner_by_name("Test27", bracket_r32.select{|m| m.bracket_position_number == 12}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 13}.first.reload.wrestler1.name == "Test7"
+    assert bracket_r32.select{|m| m.bracket_position_number == 13}.first.reload.wrestler2.name == "Test26"
     winner_by_name("Test7", bracket_r32.select{|m| m.bracket_position_number == 13}.first)
-    winner_by_name("Test10", bracket_r32.select{|m| m.bracket_position_number == 14}.first)
-    winner_by_name("Test18", bracket_r32.select{|m| m.bracket_position_number == 15}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 14}.first.reload.wrestler1.name == "Test23"
+    assert bracket_r32.select{|m| m.bracket_position_number == 14}.first.reload.wrestler2.name == "Test10"
+    winner_by_name("Test23", bracket_r32.select{|m| m.bracket_position_number == 14}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 15}.first.reload.wrestler1.name == "Test15"
+    assert bracket_r32.select{|m| m.bracket_position_number == 15}.first.reload.wrestler2.name == "Test18"
+    winner_by_name("Test15", bracket_r32.select{|m| m.bracket_position_number == 15}.first)
+    assert bracket_r32.select{|m| m.bracket_position_number == 16}.first.reload.wrestler1.name == "Test31"
+    assert bracket_r32.select{|m| m.bracket_position_number == 16}.first.reload.wrestler2.name == "Test2"
+    winner_by_name("Test2", bracket_r32.select{|m| m.bracket_position_number == 16}.first)
 
-    bracket_r16 = matches.reload.select{|m| m.bracket_position == "Bracket Round of 16"}.sort_by{|m| m.bracket_position_number}
-    assert bracket_r16.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test1"
-    assert bracket_r16.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test17"
-    assert bracket_r16.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test9"
-    assert bracket_r16.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test25"
-    assert bracket_r16.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test5"
-    assert bracket_r16.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test12"
-    assert bracket_r16.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test20"
-    assert bracket_r16.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test4"
-    assert bracket_r16.select{|m| m.bracket_position_number == 5}.first.reload.wrestler1.name == "Test3"
-    assert bracket_r16.select{|m| m.bracket_position_number == 5}.first.reload.wrestler2.name == "Test14"
-    assert bracket_r16.select{|m| m.bracket_position_number == 6}.first.reload.wrestler1.name == "Test11"
-    assert bracket_r16.select{|m| m.bracket_position_number == 6}.first.reload.wrestler2.name == "Test6"
-    assert bracket_r16.select{|m| m.bracket_position_number == 7}.first.reload.wrestler1.name == "Test7"
-    assert bracket_r16.select{|m| m.bracket_position_number == 7}.first.reload.wrestler2.name == "Test10"
-    assert bracket_r16.select{|m| m.bracket_position_number == 8}.first.reload.wrestler1.name == "Test18"
-    assert bracket_r16.select{|m| m.bracket_position_number == 8}.first.reload.wrestler2.name == "Test2"
-    winner_by_name("Test1", bracket_r16.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test25", bracket_r16.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test5", bracket_r16.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test4", bracket_r16.select{|m| m.bracket_position_number == 4}.first)
-    winner_by_name("Test3", bracket_r16.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test11", bracket_r16.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test10", bracket_r16.select{|m| m.bracket_position_number == 7}.first)
-    winner_by_name("Test2", bracket_r16.select{|m| m.bracket_position_number == 8}.first)
+    conso_r32_1 = matches.reload.select { |m| m.bracket_position == "Conso Round of 32.1" }.sort_by(&:bracket_position_number)
+    assert conso_r32_1[0].loser1_name == "BYE"
+    assert conso_r32_1[0].wrestler2.name == "Test33"
+    # BYE's auto move
+    assert conso_r32_1[1].wrestler1.name == "Test48"
+    assert conso_r32_1[1].wrestler2.name == "Test16"
+    winner_by_name("Test16", conso_r32_1[1])
+    assert conso_r32_1[2].wrestler1.name == "Test56"
+    assert conso_r32_1[2].wrestler2.name == "Test41"
+    winner_by_name("Test56", conso_r32_1[2])
+    assert conso_r32_1[3].wrestler1.name == "Test40"
+    assert conso_r32_1[3].wrestler2.name == "Test57"
+    winner_by_name("Test57", conso_r32_1[3])
+    assert conso_r32_1[4].wrestler1.name == "Test60"
+    assert conso_r32_1[4].wrestler2.name == "Test28"
+    winner_by_name("Test28", conso_r32_1[4])
+    assert conso_r32_1[5].wrestler1.name == "Test44"
+    assert conso_r32_1[5].wrestler2.name == "Test53"
+    winner_by_name("Test53", conso_r32_1[5])
+    assert conso_r32_1[6].wrestler1.name == "Test52"
+    assert conso_r32_1[6].wrestler2.name == "Test45"
+    winner_by_name("Test45", conso_r32_1[6])
+    assert conso_r32_1[7].wrestler1.name == "Test36"
+    assert conso_r32_1[7].wrestler2.name == "Test61"
+    winner_by_name("Test61", conso_r32_1[7])
+    assert conso_r32_1[8].wrestler1.name == "Test62"
+    assert conso_r32_1[8].wrestler2.name == "Test35"
+    winner_by_name("Test35", conso_r32_1[8])
+    assert conso_r32_1[9].wrestler1.name == "Test46"
+    assert conso_r32_1[9].wrestler2.name == "Test51"
+    winner_by_name("Test51", conso_r32_1[9])
+    assert conso_r32_1[10].wrestler1.name == "Test54"
+    assert conso_r32_1[10].wrestler2.name == "Test43"
+    winner_by_name("Test43", conso_r32_1[10])
+    assert conso_r32_1[11].wrestler1.name == "Test38"
+    assert conso_r32_1[11].wrestler2.name == "Test59"
+    winner_by_name("Test59", conso_r32_1[11])
+    assert conso_r32_1[12].wrestler1.name == "Test58"
+    assert conso_r32_1[12].wrestler2.name == "Test39"
+    winner_by_name("Test39", conso_r32_1[12])
+    assert conso_r32_1[13].wrestler1.name == "Test42"
+    assert conso_r32_1[13].wrestler2.name == "Test55"
+    winner_by_name("Test55", conso_r32_1[13])
+    assert conso_r32_1[14].wrestler1.name == "Test50"
+    assert conso_r32_1[14].wrestler2.name == "Test47"
+    winner_by_name("Test47", conso_r32_1[14])
+    assert conso_r32_1[15].wrestler1.name == "Test34"
+    assert conso_r32_1[15].loser2_name == "BYE"
+    # Auto BYE
 
-    conso_r16_1 = matches.reload.select{|m| m.bracket_position == "Conso Round of 16.1"}.sort_by{|m| m.bracket_position_number}
-    assert conso_r16_1.select{|m| m.bracket_position_number == 1}.first.reload.loser1_name == "BYE"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test16"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test24"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test8"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test28"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test21"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test13"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test29"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 5}.first.reload.wrestler1.name == "Test30"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 5}.first.reload.wrestler2.name == "Test19"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 6}.first.reload.wrestler1.name == "Test22"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 6}.first.reload.wrestler2.name == "Test27"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 7}.first.reload.wrestler1.name == "Test26"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 7}.first.reload.wrestler2.name == "Test23"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 8}.first.reload.wrestler1.name == "Test15"
-    assert conso_r16_1.select{|m| m.bracket_position_number == 8}.first.reload.loser2_name == "BYE"
-    winner_by_name("Test8", conso_r16_1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test21", conso_r16_1.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test29", conso_r16_1.select{|m| m.bracket_position_number == 4}.first)
-    winner_by_name("Test19", conso_r16_1.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test22", conso_r16_1.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test23", conso_r16_1.select{|m| m.bracket_position_number == 7}.first)
+    conso_r32_2 = matches.reload.select { |m| m.bracket_position == "Conso Round of 32.2" }.sort_by(&:bracket_position_number)
+    assert conso_r32_2[0].wrestler1.name == "Test31"
+    assert conso_r32_2[0].wrestler2.name == "Test33"
+    winner_by_name("Test31", conso_r32_2[0])
+    assert conso_r32_2[1].wrestler1.name == "Test18"
+    assert conso_r32_2[1].wrestler2.name == "Test16"
+    winner_by_name("Test16", conso_r32_2[1])
+    assert conso_r32_2[2].wrestler1.name == "Test10"
+    assert conso_r32_2[2].wrestler2.name == "Test56"
+    winner_by_name("Test10", conso_r32_2[2])
+    assert conso_r32_2[3].wrestler1.name == "Test26"
+    assert conso_r32_2[3].wrestler2.name == "Test57"
+    winner_by_name("Test26", conso_r32_2[3])
+    assert conso_r32_2[4].wrestler1.name == "Test6"
+    assert conso_r32_2[4].wrestler2.name == "Test28"
+    winner_by_name("Test6", conso_r32_2[4])
+    assert conso_r32_2[5].wrestler1.name == "Test22"
+    assert conso_r32_2[5].wrestler2.name == "Test53"
+    winner_by_name("Test22", conso_r32_2[5])
+    assert conso_r32_2[6].wrestler1.name == "Test14"
+    assert conso_r32_2[6].wrestler2.name == "Test45"
+    winner_by_name("Test45", conso_r32_2[6])
+    assert conso_r32_2[7].wrestler1.name == "Test30"
+    assert conso_r32_2[7].wrestler2.name == "Test61"
+    winner_by_name("Test30", conso_r32_2[7])
+    assert conso_r32_2[8].wrestler1.name == "Test29"
+    assert conso_r32_2[8].wrestler2.name == "Test35"
+    winner_by_name("Test35", conso_r32_2[8])
+    assert conso_r32_2[9].wrestler1.name == "Test20"
+    assert conso_r32_2[9].wrestler2.name == "Test51"
+    winner_by_name("Test20", conso_r32_2[9])
+    assert conso_r32_2[10].wrestler1.name == "Test12"
+    assert conso_r32_2[10].wrestler2.name == "Test43"
+    winner_by_name("Test43", conso_r32_2[10])
+    assert conso_r32_2[11].wrestler1.name == "Test37"
+    assert conso_r32_2[11].wrestler2.name == "Test59"
+    winner_by_name("Test59", conso_r32_2[11])
+    assert conso_r32_2[12].wrestler1.name == "Test25"
+    assert conso_r32_2[12].wrestler2.name == "Test39"
+    winner_by_name("Test25", conso_r32_2[12])
+    assert conso_r32_2[13].wrestler1.name == "Test9"
+    assert conso_r32_2[13].wrestler2.name == "Test55"
+    winner_by_name("Test9", conso_r32_2[13])
+    assert conso_r32_2[14].wrestler1.name == "Test49"
+    assert conso_r32_2[14].wrestler2.name == "Test47"
+    winner_by_name("Test47", conso_r32_2[14])
+    assert conso_r32_2[15].wrestler1.name == "Test32"
+    assert conso_r32_2[15].wrestler2.name == "Test34"
+    winner_by_name("Test32", conso_r32_2[15])
 
-    conso_r16_2 = matches.reload.select{|m| m.bracket_position == "Conso Round of 16.2"}.sort_by{|m| m.bracket_position_number}
-    assert conso_r16_2.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test18"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test16"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test7"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test8"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test6"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test21"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test14"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test29"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 5}.first.reload.wrestler1.name == "Test20"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 5}.first.reload.wrestler2.name == "Test19"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 6}.first.reload.wrestler1.name == "Test12"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 6}.first.reload.wrestler2.name == "Test22"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 7}.first.reload.wrestler1.name == "Test9"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 7}.first.reload.wrestler2.name == "Test23"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 8}.first.reload.wrestler1.name == "Test17"
-    assert conso_r16_2.select{|m| m.bracket_position_number == 8}.first.reload.wrestler2.name == "Test15"
-    winner_by_name("Test16", conso_r16_2.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test8", conso_r16_2.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test6", conso_r16_2.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test29", conso_r16_2.select{|m| m.bracket_position_number == 4}.first)
-    winner_by_name("Test20", conso_r16_2.select{|m| m.bracket_position_number == 5}.first)
-    winner_by_name("Test12", conso_r16_2.select{|m| m.bracket_position_number == 6}.first)
-    winner_by_name("Test23", conso_r16_2.select{|m| m.bracket_position_number == 7}.first)
-    winner_by_name("Test17", conso_r16_2.select{|m| m.bracket_position_number == 8}.first)
+    bracket_r16 = matches.reload.select { |m| m.bracket_position == "Bracket Round of 16" }.sort_by(&:bracket_position_number)
+    assert bracket_r16[0].wrestler1.name == "Test1"
+    assert bracket_r16[0].wrestler2.name == "Test17"
+    winner_by_name("Test1", bracket_r16[0])
+    assert bracket_r16[1].wrestler1.name == "Test24"
+    assert bracket_r16[1].wrestler2.name == "Test8"
+    winner_by_name("Test8", bracket_r16[1])
+    assert bracket_r16[2].wrestler1.name == "Test5"
+    assert bracket_r16[2].wrestler2.name == "Test21"
+    winner_by_name("Test5", bracket_r16[2])
+    assert bracket_r16[3].wrestler1.name == "Test13"
+    assert bracket_r16[3].wrestler2.name == "Test4"
+    winner_by_name("Test4", bracket_r16[3])
+    assert bracket_r16[4].wrestler1.name == "Test3"
+    assert bracket_r16[4].wrestler2.name == "Test19"
+    winner_by_name("Test3", bracket_r16[4])
+    assert bracket_r16[5].wrestler1.name == "Test11"
+    assert bracket_r16[5].wrestler2.name == "Test27"
+    winner_by_name("Test27", bracket_r16[5])
+    assert bracket_r16[6].wrestler1.name == "Test7"
+    assert bracket_r16[6].wrestler2.name == "Test23"
+    winner_by_name("Test23", bracket_r16[6])
+    assert bracket_r16[7].wrestler1.name == "Test15"
+    assert bracket_r16[7].wrestler2.name == "Test2"
+    winner_by_name("Test2", bracket_r16[7])
 
-    conso_r8_1 = matches.reload.select{|m| m.bracket_position == "Conso Round of 8.1"}.sort_by{|m| m.bracket_position_number}
-    assert conso_r8_1.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test16"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test8"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test6"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test29"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test20"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test12"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test23"
-    assert conso_r8_1.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test17"
-    winner_by_name("Test8", conso_r8_1.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test6", conso_r8_1.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test20", conso_r8_1.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test17", conso_r8_1.select{|m| m.bracket_position_number == 4}.first)
+    quarters = matches.reload.select { |m| m.bracket_position == "Quarter" }.sort_by(&:bracket_position_number)
+    assert_equal "Test1", quarters[0].reload.wrestler1.name
+    assert_equal "Test8", quarters[0].reload.wrestler2.name
+    assert_equal "Test5", quarters[1].reload.wrestler1.name
+    assert_equal "Test4", quarters[1].reload.wrestler2.name
+    assert_equal "Test3", quarters[2].reload.wrestler1.name
+    assert_equal "Test27", quarters[2].reload.wrestler2.name
+    assert_equal "Test23", quarters[3].reload.wrestler1.name
+    assert_equal "Test2", quarters[3].reload.wrestler2.name
+    winner_by_name("Test1", quarters[0])
+    winner_by_name("Test5", quarters[1])
+    winner_by_name("Test3", quarters[2])
+    winner_by_name("Test2", quarters[3])
 
-    quarters = matches.reload.select{|m| m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert quarters.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test1"
-    assert quarters.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test25"
-    assert quarters.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test5"
-    assert quarters.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test4"
-    assert quarters.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test3"
-    assert quarters.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test11"
-    assert quarters.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test10"
-    assert quarters.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test2"
-    winner_by_name("Test1", quarters.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test5", quarters.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test11", quarters.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test2", quarters.select{|m| m.bracket_position_number == 4}.first)
+    conso_r16_1 = matches.reload.select { |m| m.bracket_position == "Conso Round of 16.1" }.sort_by(&:bracket_position_number)
+    assert_equal "Test31", conso_r16_1[0].reload.wrestler1.name
+    assert_equal "Test16", conso_r16_1[0].reload.wrestler2.name
+    assert_equal "Test10", conso_r16_1[1].reload.wrestler1.name
+    assert_equal "Test26", conso_r16_1[1].reload.wrestler2.name
+    assert_equal "Test6",  conso_r16_1[2].reload.wrestler1.name
+    assert_equal "Test22", conso_r16_1[2].reload.wrestler2.name
+    assert_equal "Test45", conso_r16_1[3].reload.wrestler1.name
+    assert_equal "Test30", conso_r16_1[3].reload.wrestler2.name
+    assert_equal "Test35", conso_r16_1[4].reload.wrestler1.name
+    assert_equal "Test20", conso_r16_1[4].reload.wrestler2.name
+    assert_equal "Test43", conso_r16_1[5].reload.wrestler1.name
+    assert_equal "Test59", conso_r16_1[5].reload.wrestler2.name
+    assert_equal "Test25", conso_r16_1[6].reload.wrestler1.name
+    assert_equal "Test9",  conso_r16_1[6].reload.wrestler2.name
+    assert_equal "Test47", conso_r16_1[7].reload.wrestler1.name
+    assert_equal "Test32", conso_r16_1[7].reload.wrestler2.name
+    winner_by_name("Test16", conso_r16_1[0])
+    winner_by_name("Test10", conso_r16_1[1])
+    winner_by_name("Test6",  conso_r16_1[2])
+    winner_by_name("Test30", conso_r16_1[3])
+    winner_by_name("Test35", conso_r16_1[4])
+    winner_by_name("Test43", conso_r16_1[5])
+    winner_by_name("Test25", conso_r16_1[6])
+    winner_by_name("Test32", conso_r16_1[7])
 
-    conso_r8_2 = matches.reload.select{|m| m.bracket_position == "Conso Round of 8.2"}.sort_by{|m| m.bracket_position_number}
-    assert conso_r8_2.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test25"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test8"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test4"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test6"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 3}.first.reload.wrestler1.name == "Test3"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 3}.first.reload.wrestler2.name == "Test20"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 4}.first.reload.wrestler1.name == "Test10"
-    assert conso_r8_2.select{|m| m.bracket_position_number == 4}.first.reload.wrestler2.name == "Test17"
-    winner_by_name("Test8", conso_r8_2.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test6", conso_r8_2.select{|m| m.bracket_position_number == 2}.first)
-    winner_by_name("Test3", conso_r8_2.select{|m| m.bracket_position_number == 3}.first)
-    winner_by_name("Test10", conso_r8_2.select{|m| m.bracket_position_number == 4}.first)
+    conso_r16_2 = matches.reload.select { |m| m.bracket_position == "Conso Round of 16.2" }.sort_by(&:bracket_position_number)
+    assert_equal "Test17", conso_r16_2[0].reload.wrestler1.name
+    assert_equal "Test16", conso_r16_2[0].reload.wrestler2.name
+    assert_equal "Test24", conso_r16_2[1].reload.wrestler1.name
+    assert_equal "Test10", conso_r16_2[1].reload.wrestler2.name
+    assert_equal "Test21", conso_r16_2[2].reload.wrestler1.name
+    assert_equal "Test6",  conso_r16_2[2].reload.wrestler2.name
+    assert_equal "Test13", conso_r16_2[3].reload.wrestler1.name
+    assert_equal "Test30", conso_r16_2[3].reload.wrestler2.name
+    assert_equal "Test19", conso_r16_2[4].reload.wrestler1.name
+    assert_equal "Test35", conso_r16_2[4].reload.wrestler2.name
+    assert_equal "Test11", conso_r16_2[5].reload.wrestler1.name
+    assert_equal "Test43", conso_r16_2[5].reload.wrestler2.name
+    assert_equal "Test7",  conso_r16_2[6].reload.wrestler1.name
+    assert_equal "Test25", conso_r16_2[6].reload.wrestler2.name
+    assert_equal "Test15", conso_r16_2[7].reload.wrestler1.name
+    assert_equal "Test32", conso_r16_2[7].reload.wrestler2.name
+    winner_by_name("Test16", conso_r16_2[0])
+    winner_by_name("Test10", conso_r16_2[1])
+    winner_by_name("Test6",  conso_r16_2[2])
+    winner_by_name("Test30", conso_r16_2[3])
+    winner_by_name("Test35", conso_r16_2[4])
+    winner_by_name("Test43", conso_r16_2[5])
+    winner_by_name("Test25", conso_r16_2[6])
+    winner_by_name("Test32", conso_r16_2[7])
 
-    quarters_conso = matches.reload.select{|m| m.bracket_position == "Conso Quarter"}.sort_by{|m| m.bracket_position_number}
-    assert quarters_conso.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test8"
-    assert quarters_conso.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test6"
-    assert quarters_conso.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test3"
-    assert quarters_conso.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test10"
-    winner_by_name("Test8", quarters_conso.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test3", quarters_conso.select{|m| m.bracket_position_number == 2}.first)
+    conso_r8_1 = matches.reload.select { |m| m.bracket_position == "Conso Round of 8.1" }.sort_by(&:bracket_position_number)
+    assert_equal "Test16", conso_r8_1[0].reload.wrestler1.name
+    assert_equal "Test10", conso_r8_1[0].reload.wrestler2.name
+    assert_equal "Test6",  conso_r8_1[1].reload.wrestler1.name
+    assert_equal "Test30", conso_r8_1[1].reload.wrestler2.name
+    assert_equal "Test35", conso_r8_1[2].reload.wrestler1.name
+    assert_equal "Test43", conso_r8_1[2].reload.wrestler2.name
+    assert_equal "Test25", conso_r8_1[3].reload.wrestler1.name
+    assert_equal "Test32", conso_r8_1[3].reload.wrestler2.name
+    winner_by_name("Test16", conso_r8_1[0])
+    winner_by_name("Test6",  conso_r8_1[1])
+    winner_by_name("Test35", conso_r8_1[2])
+    winner_by_name("Test25", conso_r8_1[3])
 
-    semis = matches.reload.select{|m| m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test1"
-    assert semis.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test5"
-    assert semis.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test11"
-    assert semis.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test2"
-    winner_by_name("Test5", semis.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test2", semis.select{|m| m.bracket_position_number == 2}.first)
+    conso_r8_2 = matches.reload.select { |m| m.bracket_position == "Conso Round of 8.2" }.sort_by(&:bracket_position_number)
+    assert_equal "Test23", conso_r8_2[0].reload.wrestler1.name
+    assert_equal "Test16", conso_r8_2[0].reload.wrestler2.name
+    assert_equal "Test27", conso_r8_2[1].reload.wrestler1.name
+    assert_equal "Test6",  conso_r8_2[1].reload.wrestler2.name
+    assert_equal "Test4",  conso_r8_2[2].reload.wrestler1.name
+    assert_equal "Test35", conso_r8_2[2].reload.wrestler2.name
+    assert_equal "Test8",  conso_r8_2[3].reload.wrestler1.name
+    assert_equal "Test25", conso_r8_2[3].reload.wrestler2.name
+    winner_by_name("Test16", conso_r8_2[0])
+    winner_by_name("Test6",  conso_r8_2[1])
+    winner_by_name("Test35", conso_r8_2[2])
+    winner_by_name("Test25", conso_r8_2[3])
 
-    semis_conso = matches.reload.select{|m| m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}
-    assert semis_conso.select{|m| m.bracket_position_number == 1}.first.reload.wrestler1.name == "Test11"
-    assert semis_conso.select{|m| m.bracket_position_number == 1}.first.reload.wrestler2.name == "Test8"
-    assert semis_conso.select{|m| m.bracket_position_number == 2}.first.reload.wrestler1.name == "Test1"
-    assert semis_conso.select{|m| m.bracket_position_number == 2}.first.reload.wrestler2.name == "Test3"
-    winner_by_name("Test11", semis_conso.select{|m| m.bracket_position_number == 1}.first)
-    winner_by_name("Test3", semis_conso.select{|m| m.bracket_position_number == 2}.first)
+    conso_quarters = matches.reload.select { |m| m.bracket_position == "Conso Quarter" }.sort_by(&:bracket_position_number)
+    assert conso_quarters.select { |m| m.bracket_position_number == 1 }.first.reload.wrestler1.name == "Test16"
+    assert conso_quarters.select { |m| m.bracket_position_number == 1 }.first.reload.wrestler2.name == "Test6"
+    winner_by_name("Test16", conso_quarters.select { |m| m.bracket_position_number == 1 }.first)
+    assert conso_quarters.select { |m| m.bracket_position_number == 2 }.first.reload.wrestler1.name == "Test35"
+    assert conso_quarters.select { |m| m.bracket_position_number == 2 }.first.reload.wrestler2.name == "Test25"
+    winner_by_name("Test35", conso_quarters.select { |m| m.bracket_position_number == 2 }.first)
 
-    first_finals = matches.select{|m| m.bracket_position == "1/2"}.first
-    third_finals = matches.select{|m| m.bracket_position == "3/4"}.first
-    fifth_finals = matches.select{|m| m.bracket_position == "5/6"}.first
-    seventh_finals = matches.select{|m| m.bracket_position == "7/8"}.first
+    semis = matches.reload.select { |m| m.bracket_position == "Semis" }.sort_by(&:bracket_position_number)
+    assert_equal "Test1", semis[0].reload.wrestler1.name
+    assert_equal "Test5", semis[0].reload.wrestler2.name
+    assert_equal "Test3", semis[1].reload.wrestler1.name
+    assert_equal "Test2", semis[1].reload.wrestler2.name
+    winner_by_name("Test5", semis[0])
+    winner_by_name("Test2", semis[1])
 
-    assert first_finals.reload.wrestler1.name == "Test5"
-    assert first_finals.reload.wrestler2.name == "Test2"
+    semis_conso = matches.reload.select { |m| m.bracket_position == "Conso Semis" }.sort_by(&:bracket_position_number)
+    bout0_names = [semis_conso[0].reload.wrestler1&.name, semis_conso[0].reload.wrestler2&.name]
+    bout1_names = [semis_conso[1].reload.wrestler1&.name, semis_conso[1].reload.wrestler2&.name]
+    assert (bout0_names & ["Test1","Test16"]).size == 2
+    assert (bout1_names & ["Test3","Test35"]).size == 2
+    winner_by_name("Test1", semis_conso[0])
+    winner_by_name("Test3", semis_conso[1])
 
-    assert third_finals.reload.wrestler1.name == "Test11"
-    assert third_finals.reload.wrestler2.name == "Test3"
+    # --- PLACEMENT MATCHES ---
+    first_finals   = matches.reload.find { |m| m.bracket_position == "1/2" }
+    third_finals   = matches.reload.find { |m| m.bracket_position == "3/4" }
+    fifth_finals   = matches.reload.find { |m| m.bracket_position == "5/6" }
+    seventh_finals = matches.reload.find { |m| m.bracket_position == "7/8" }
 
-    assert fifth_finals.reload.wrestler1.name == "Test8"
-    assert fifth_finals.reload.wrestler2.name == "Test1"
-    
-    assert seventh_finals.reload.wrestler1.name == "Test6"
-    assert seventh_finals.reload.wrestler2.name == "Test10"
+    # 1st/2nd: winners of semis
+    assert_equal "Test5", first_finals.reload.wrestler1.name
+    assert_equal "Test2", first_finals.reload.wrestler2.name
+
+    # 3rd/4th: winners of Conso Semis (we set winners to champs losers 1 and 3)
+    assert_equal "Test1", third_finals.reload.wrestler1.name
+    assert_equal "Test3", third_finals.reload.wrestler2.name
+
+    # 5th/6th: losers of Conso Semis (the CQ winners we defeated there)
+    assert_equal "Test16", fifth_finals.reload.wrestler1.name
+    assert_equal "Test35", fifth_finals.reload.wrestler2.name
+
+    # 7th/8th: losers of Conso Quarters (the two who didn’t advance: 6 and 25)
+    assert_equal "Test6",  seventh_finals.reload.wrestler1.name
+    assert_equal "Test25", seventh_finals.reload.wrestler2.name
 
     # DEBUG
     # matches.sort_by{|m| m.bout_number}.each do |match|
     #   match.reload
-    #   puts "Round #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
+    #   puts "Bracket Position: #{match.bracket_position} Round: #{match.round} #{match.w1_bracket_name} vs #{match.w2_bracket_name}"
     # end
-end
+  end
+end