diff --git a/tasks/rematch_all.rake b/tasks/rematch_all.rake
new file mode 100644
index 000000000..fc36bd939
--- /dev/null
+++ b/tasks/rematch_all.rake
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+desc 'Rematch all the tests with their new values'
+task :rematch_all do
+  FileList.new('test/**/*_test.rb.yml').each { |f| File.delete(f) }
+  Rake::Task['test'].invoke
+end
diff --git a/test/pagy/extras/bootstrap_test.rb.yml b/test/pagy/extras/bootstrap_test.rb.yml
index 1e1d025aa..098f839ee 100644
--- a/test/pagy/extras/bootstrap_test.rb.yml
+++ b/test/pagy/extras/bootstrap_test.rb.yml
@@ -1,4 +1,21 @@
 ---
+pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first page 1: '<nav
+  class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group"
+  role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
+  none;\&quot;></a>&quot;]"><a class="prev btn btn-primary disabled" href="#">&lsaquo;&nbsp;Prev</a><div
+  class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;"><label>Page
+  <input type="number" min="1" max="6" value="1" class="text-primary" style="padding:
+  0; border: none; text-align: center; width: 2rem;"></label> of 6</div><a href="/foo?page=2"   rel="next"
+  aria-label="next" class="next btn btn-primary">Next&nbsp;&rsaquo;</a></div></nav>'
+pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first page 2: '<nav
+  id="test-nav-id" class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div
+  class="btn-group" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a
+  class="prev btn btn-primary disabled" href="#">&lsaquo;&nbsp;Prev</a><div class="pagy-combo-input
+  btn btn-primary disabled" style="white-space: nowrap;"><label>Page <input type="number"
+  min="1" max="6" value="1" class="text-primary" style="padding: 0; border: none;
+  text-align: center; width: 2rem;"></label> of 6</div><a href="/foo?page=2"  link-extra
+  rel="next" aria-label="next" class="next btn btn-primary">Next&nbsp;&rsaquo;</a></div></nav>'
 pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0002_renders intermediate page 1: '<nav
   class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group"
   role="group" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
@@ -18,23 +35,6 @@ pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0002_renders intermedia
   max="6" value="3" class="text-primary" style="padding: 0; border: none; text-align:
   center; width: 2rem;"></label> of 6</div><a href="/foo?page=4"  link-extra rel="next"
   aria-label="next" class="next btn btn-primary">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first page 1: '<nav
-  class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group"
-  role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
-  none;\&quot;></a>&quot;]"><a class="prev btn btn-primary disabled" href="#">&lsaquo;&nbsp;Prev</a><div
-  class="pagy-combo-input btn btn-primary disabled" style="white-space: nowrap;"><label>Page
-  <input type="number" min="1" max="6" value="1" class="text-primary" style="padding:
-  0; border: none; text-align: center; width: 2rem;"></label> of 6</div><a href="/foo?page=2"   rel="next"
-  aria-label="next" class="next btn btn-primary">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0001_renders first page 2: '<nav
-  id="test-nav-id" class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div
-  class="btn-group" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a
-  class="prev btn btn-primary disabled" href="#">&lsaquo;&nbsp;Prev</a><div class="pagy-combo-input
-  btn btn-primary disabled" style="white-space: nowrap;"><label>Page <input type="number"
-  min="1" max="6" value="1" class="text-primary" style="padding: 0; border: none;
-  text-align: center; width: 2rem;"></label> of 6</div><a href="/foo?page=2"  link-extra
-  rel="next" aria-label="next" class="next btn btn-primary">Next&nbsp;&rsaquo;</a></div></nav>'
 pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0003_renders last page 1: '<nav
   class="pagy-bootstrap-combo-nav-js pagination" aria-label="pager"><div class="btn-group"
   role="group" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
@@ -54,26 +54,6 @@ pagy/extras/bootstrap::#pagy_bootstrap_combo_nav_js#test_0003_renders last page
   max="6" value="6" class="text-primary" style="padding: 0; border: none; text-align:
   center; width: 2rem;"></label> of 6</div><a class="next btn btn-primary disabled"
   href="#">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0001_renders first page 1: <nav
-  class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
-  class=\&quot;pagination\&quot;><li class=\&quot;page-item prev disabled\&quot;><a
-  href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li
-  class=\&quot;page-item\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;  >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;page-item active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;  >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
-  class=\&quot;page-item gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=2\&quot;  class=\&quot;page-link\&quot;  rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0001_renders first page 2: <nav
-  id="test-nav-id" class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
-  class=\&quot;pagination\&quot;><li class=\&quot;page-item prev disabled\&quot;><a
-  href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li
-  class=\&quot;page-item\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;
-  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li class=\&quot;page-item
-  active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;
-  link-extra >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;page-item
-  gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=2\&quot;  class=\&quot;page-link\&quot;
-  link-extra rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
 pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0003_renders last page 1: <nav
   class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
   class=\&quot;pagination\&quot;><li class=\&quot;page-item prev\&quot;><a href=\&quot;/foo?page=49\&quot;  class=\&quot;page-link\&quot;  rel=\&quot;prev\&quot;
@@ -112,6 +92,26 @@ pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0004_renders with :steps 2: <
   gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
   class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=21\&quot;  class=\&quot;page-link\&quot;
   link-extra rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0001_renders first page 1: <nav
+  class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
+  class=\&quot;pagination\&quot;><li class=\&quot;page-item prev disabled\&quot;><a
+  href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li
+  class=\&quot;page-item\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;  >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;page-item active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;  >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
+  class=\&quot;page-item gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=2\&quot;  class=\&quot;page-link\&quot;  rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0001_renders first page 2: <nav
+  id="test-nav-id" class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
+  class=\&quot;pagination\&quot;><li class=\&quot;page-item prev disabled\&quot;><a
+  href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li
+  class=\&quot;page-item\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;
+  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li class=\&quot;page-item
+  active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;page-link\&quot;
+  link-extra >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;page-item
+  gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=2\&quot;  class=\&quot;page-link\&quot;
+  link-extra rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
 pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0002_renders intermediate page 1: <nav
   class="pagy-njs pagy-bootstrap-nav-js" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
   class=\&quot;pagination\&quot;><li class=\&quot;page-item prev\&quot;><a href=\&quot;/foo?page=19\&quot;  class=\&quot;page-link\&quot;  rel=\&quot;prev\&quot;
@@ -132,6 +132,39 @@ pagy/extras/bootstrap::#pagy_bootstrap_nav_js#test_0002_renders intermediate pag
   gap disabled\&quot;><a href=\&quot;#\&quot; class=\&quot;page-link\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
   class=\&quot;page-item next\&quot;><a href=\&quot;/foo?page=21\&quot;  class=\&quot;page-link\&quot;
   link-extra rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0002_renders intermediate page 1: <nav
+  class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination"><li class="page-item
+  prev"><a href="/foo?page=19"  class="page-link"  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li
+  class="page-item"><a href="/foo?page=1"  class="page-link"  >1</a></li><li class="page-item
+  gap disabled"><a href="#" class="page-link">&hellip;</a></li><li class="page-item"><a
+  href="/foo?page=16"  class="page-link"  >16</a></li><li class="page-item"><a href="/foo?page=17"  class="page-link"  >17</a></li><li
+  class="page-item"><a href="/foo?page=18"  class="page-link"  >18</a></li><li class="page-item"><a
+  href="/foo?page=19"  class="page-link"  rel="prev" >19</a></li><li class="page-item
+  active"><a href="/foo?page=20"  class="page-link"  >20</a></li><li class="page-item"><a
+  href="/foo?page=21"  class="page-link"  rel="next" >21</a></li><li class="page-item"><a
+  href="/foo?page=22"  class="page-link"  >22</a></li><li class="page-item"><a href="/foo?page=23"  class="page-link"  >23</a></li><li
+  class="page-item"><a href="/foo?page=24"  class="page-link"  >24</a></li><li class="page-item
+  gap disabled"><a href="#" class="page-link">&hellip;</a></li><li class="page-item"><a
+  href="/foo?page=50"  class="page-link"  >50</a></li><li class="page-item next"><a
+  href="/foo?page=21"  class="page-link"  rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
+pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0002_renders intermediate page 2: <nav
+  id="test-nav-id" class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination"><li
+  class="page-item prev"><a href="/foo?page=19"  class="page-link" link-extra rel="prev"
+  aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li class="page-item"><a href="/foo?page=1"  class="page-link"
+  link-extra >1</a></li><li class="page-item gap disabled"><a href="#" class="page-link">&hellip;</a></li><li
+  class="page-item"><a href="/foo?page=16"  class="page-link" link-extra >16</a></li><li
+  class="page-item"><a href="/foo?page=17"  class="page-link" link-extra >17</a></li><li
+  class="page-item"><a href="/foo?page=18"  class="page-link" link-extra >18</a></li><li
+  class="page-item"><a href="/foo?page=19"  class="page-link" link-extra rel="prev"
+  >19</a></li><li class="page-item active"><a href="/foo?page=20"  class="page-link"
+  link-extra >20</a></li><li class="page-item"><a href="/foo?page=21"  class="page-link"
+  link-extra rel="next" >21</a></li><li class="page-item"><a href="/foo?page=22"  class="page-link"
+  link-extra >22</a></li><li class="page-item"><a href="/foo?page=23"  class="page-link"
+  link-extra >23</a></li><li class="page-item"><a href="/foo?page=24"  class="page-link"
+  link-extra >24</a></li><li class="page-item gap disabled"><a href="#" class="page-link">&hellip;</a></li><li
+  class="page-item"><a href="/foo?page=50"  class="page-link" link-extra >50</a></li><li
+  class="page-item next"><a href="/foo?page=21"  class="page-link" link-extra rel="next"
+  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
 pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0003_renders last page 1: <nav class="pagy-bootstrap-nav"
   aria-label="pager"><ul class="pagination"><li class="page-item prev"><a href="/foo?page=49"  class="page-link"  rel="prev"
   aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li class="page-item"><a href="/foo?page=1"  class="page-link"  >1</a></li><li
@@ -172,36 +205,3 @@ pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0001_renders first page 2: <nav
   gap disabled"><a href="#" class="page-link">&hellip;</a></li><li class="page-item"><a
   href="/foo?page=50"  class="page-link" link-extra >50</a></li><li class="page-item
   next"><a href="/foo?page=2"  class="page-link" link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0002_renders intermediate page 1: <nav
-  class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination"><li class="page-item
-  prev"><a href="/foo?page=19"  class="page-link"  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li
-  class="page-item"><a href="/foo?page=1"  class="page-link"  >1</a></li><li class="page-item
-  gap disabled"><a href="#" class="page-link">&hellip;</a></li><li class="page-item"><a
-  href="/foo?page=16"  class="page-link"  >16</a></li><li class="page-item"><a href="/foo?page=17"  class="page-link"  >17</a></li><li
-  class="page-item"><a href="/foo?page=18"  class="page-link"  >18</a></li><li class="page-item"><a
-  href="/foo?page=19"  class="page-link"  rel="prev" >19</a></li><li class="page-item
-  active"><a href="/foo?page=20"  class="page-link"  >20</a></li><li class="page-item"><a
-  href="/foo?page=21"  class="page-link"  rel="next" >21</a></li><li class="page-item"><a
-  href="/foo?page=22"  class="page-link"  >22</a></li><li class="page-item"><a href="/foo?page=23"  class="page-link"  >23</a></li><li
-  class="page-item"><a href="/foo?page=24"  class="page-link"  >24</a></li><li class="page-item
-  gap disabled"><a href="#" class="page-link">&hellip;</a></li><li class="page-item"><a
-  href="/foo?page=50"  class="page-link"  >50</a></li><li class="page-item next"><a
-  href="/foo?page=21"  class="page-link"  rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/bootstrap::#pagy_bootstrap_nav#test_0002_renders intermediate page 2: <nav
-  id="test-nav-id" class="pagy-bootstrap-nav" aria-label="pager"><ul class="pagination"><li
-  class="page-item prev"><a href="/foo?page=19"  class="page-link" link-extra rel="prev"
-  aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li class="page-item"><a href="/foo?page=1"  class="page-link"
-  link-extra >1</a></li><li class="page-item gap disabled"><a href="#" class="page-link">&hellip;</a></li><li
-  class="page-item"><a href="/foo?page=16"  class="page-link" link-extra >16</a></li><li
-  class="page-item"><a href="/foo?page=17"  class="page-link" link-extra >17</a></li><li
-  class="page-item"><a href="/foo?page=18"  class="page-link" link-extra >18</a></li><li
-  class="page-item"><a href="/foo?page=19"  class="page-link" link-extra rel="prev"
-  >19</a></li><li class="page-item active"><a href="/foo?page=20"  class="page-link"
-  link-extra >20</a></li><li class="page-item"><a href="/foo?page=21"  class="page-link"
-  link-extra rel="next" >21</a></li><li class="page-item"><a href="/foo?page=22"  class="page-link"
-  link-extra >22</a></li><li class="page-item"><a href="/foo?page=23"  class="page-link"
-  link-extra >23</a></li><li class="page-item"><a href="/foo?page=24"  class="page-link"
-  link-extra >24</a></li><li class="page-item gap disabled"><a href="#" class="page-link">&hellip;</a></li><li
-  class="page-item"><a href="/foo?page=50"  class="page-link" link-extra >50</a></li><li
-  class="page-item next"><a href="/foo?page=21"  class="page-link" link-extra rel="next"
-  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
diff --git a/test/pagy/extras/bulma_test.rb.yml b/test/pagy/extras/bulma_test.rb.yml
index 3b55e7501..e87754c7d 100644
--- a/test/pagy/extras/bulma_test.rb.yml
+++ b/test/pagy/extras/bulma_test.rb.yml
@@ -1,22 +1,4 @@
 ---
-pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0001_renders first page 1: '<nav
-  class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped
-  is-grouped-centered" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><p
-  class="control"><a class="button" disabled>&lsaquo;&nbsp;Prev</a></p><div class="pagy-combo-input
-  control level is-mobile"><label>Page <input class="input" type="number" min="1"
-  max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:0 0.3rem;"></label>
-  of 6</div><p class="control"><a href="/foo?page=2"   rel="next" class="button" aria-label="next
-  page">Next&nbsp;&rsaquo;</a></p></div></nav>'
-pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0001_renders first page 2: '<nav
-  id="test-nav-id" class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field
-  is-grouped is-grouped-centered" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><p
-  class="control"><a class="button" disabled>&lsaquo;&nbsp;Prev</a></p><div class="pagy-combo-input
-  control level is-mobile"><label>Page <input class="input" type="number" min="1"
-  max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:0 0.3rem;"></label>
-  of 6</div><p class="control"><a href="/foo?page=2"  link-extra rel="next" class="button"
-  aria-label="next page">Next&nbsp;&rsaquo;</a></p></div></nav>'
 pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0002_renders intermediate page 1: '<nav
   class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped
   is-grouped-centered" role="group" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
@@ -52,76 +34,24 @@ pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0003_renders last page 2: '<nav
   <input class="input" type="number" min="1" max="6" value="6" style="padding: 0;
   text-align: center; width: 2rem; margin:0 0.3rem;"></label> of 6</div><p class="control"><a
   class="button" disabled>Next&nbsp;&rsaquo;</a></p></div></nav>'
-pagy/extras/bulma::#pagy_bulma_nav#test_0001_renders first page 1: <nav class="pagy-bulma-nav
-  pagination is-centered" aria-label="pagination"><a class="pagination-previous" disabled>&lsaquo;&nbsp;Prev</a><a
-  href="/foo?page=2"   rel="next" class="pagination-next" aria-label="next page">Next&nbsp;&rsaquo;</a><ul
-  class="pagination-list"><li><a href="/foo?page=1"   class="pagination-link is-current"
-  aria-label="page 1" aria-current="page">1</a></li><li><a href="/foo?page=2"   rel="next"
-  class="pagination-link" aria-label="goto page 2">2</a></li><li><a href="/foo?page=3"   class="pagination-link"
-  aria-label="goto page 3">3</a></li><li><a href="/foo?page=4"   class="pagination-link"
-  aria-label="goto page 4">4</a></li><li><a href="/foo?page=5"   class="pagination-link"
-  aria-label="goto page 5">5</a></li><li><span class="pagination-ellipsis">&hellip;</span></li><li><a
-  href="/foo?page=50"   class="pagination-link" aria-label="goto page 50">50</a></li></ul></nav>
-pagy/extras/bulma::#pagy_bulma_nav#test_0001_renders first page 2: <nav id="test-nav-id"
-  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a class=\&quot;pagination-previous\&quot;
-  disabled>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=2\&quot;  link-extra rel=\&quot;next\&quot;
-  class=\&quot;pagination-next\&quot; aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul
-  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  class=\&quot;pagination-link\&quot; aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
-  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
-  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav#test_0002_renders intermediate page 1: <nav class="pagy-bulma-nav
-  pagination is-centered" aria-label="pagination"><a href="/foo?page=19"   rel="prev"
-  class="pagination-previous" aria-label="previous page">&lsaquo;&nbsp;Prev</a><a
-  href="/foo?page=21"   rel="next" class="pagination-next" aria-label="next page">Next&nbsp;&rsaquo;</a><ul
-  class="pagination-list"><li><a href="/foo?page=1"   class="pagination-link" aria-label="goto
-  page 1">1</a></li><li><span class="pagination-ellipsis">&hellip;</span></li><li><a
-  href="/foo?page=16"   class="pagination-link" aria-label="goto page 16">16</a></li><li><a
-  href="/foo?page=17"   class="pagination-link" aria-label="goto page 17">17</a></li><li><a
-  href="/foo?page=18"   class="pagination-link" aria-label="goto page 18">18</a></li><li><a
-  href="/foo?page=19"   rel="prev" class="pagination-link" aria-label="goto page 19">19</a></li><li><a
-  href="/foo?page=20"   class="pagination-link is-current" aria-label="page 20" aria-current="page">20</a></li><li><a
-  href="/foo?page=21"   rel="next" class="pagination-link" aria-label="goto page 21">21</a></li><li><a
-  href="/foo?page=22"   class="pagination-link" aria-label="goto page 22">22</a></li><li><a
-  href="/foo?page=23"   class="pagination-link" aria-label="goto page 23">23</a></li><li><a
-  href="/foo?page=24"   class="pagination-link" aria-label="goto page 24">24</a></li><li><span
-  class="pagination-ellipsis">&hellip;</span></li><li><a href="/foo?page=50"   class="pagination-link"
-  aria-label="goto page 50">50</a></li></ul></nav>
-pagy/extras/bulma::#pagy_bulma_nav#test_0002_renders intermediate page 2: <nav id="test-nav-id"
-  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;  link-extra
-  rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
-  page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;  link-extra
-  rel=\&quot;next\&quot; class=\&quot;pagination-next\&quot; aria-label=\&quot;next
-  page\&quot;>Next&nbsp;&rsaquo;</a><ul class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link\&quot;
-  aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
-  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
-  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav#test_0003_renders last page 1: <nav class="pagy-bulma-nav
-  pagination is-centered" aria-label="pagination"><a href="/foo?page=49"   rel="prev"
-  class="pagination-previous" aria-label="previous page">&lsaquo;&nbsp;Prev</a><a
-  class="pagination-next" disabled>Next&nbsp;&rsaquo;</a><ul class="pagination-list"><li><a
-  href="/foo?page=1"   class="pagination-link" aria-label="goto page 1">1</a></li><li><span
-  class="pagination-ellipsis">&hellip;</span></li><li><a href="/foo?page=46"   class="pagination-link"
-  aria-label="goto page 46">46</a></li><li><a href="/foo?page=47"   class="pagination-link"
-  aria-label="goto page 47">47</a></li><li><a href="/foo?page=48"   class="pagination-link"
-  aria-label="goto page 48">48</a></li><li><a href="/foo?page=49"   rel="prev" class="pagination-link"
-  aria-label="goto page 49">49</a></li><li><a href="/foo?page=50"   class="pagination-link
-  is-current" aria-label="page 50" aria-current="page">50</a></li></ul></nav>
-pagy/extras/bulma::#pagy_bulma_nav#test_0003_renders last page 2: <nav id="test-nav-id"
-  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=49\&quot;  link-extra
-  rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
-  page\&quot;>&lsaquo;&nbsp;Prev</a><a class=\&quot;pagination-next\&quot; disabled>Next&nbsp;&rsaquo;</a><ul
-  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  class=\&quot;pagination-link\&quot; aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
-  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
-  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0001_renders first page 1: '<nav
+  class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field is-grouped
+  is-grouped-centered" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><p
+  class="control"><a class="button" disabled>&lsaquo;&nbsp;Prev</a></p><div class="pagy-combo-input
+  control level is-mobile"><label>Page <input class="input" type="number" min="1"
+  max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:0 0.3rem;"></label>
+  of 6</div><p class="control"><a href="/foo?page=2"   rel="next" class="button" aria-label="next
+  page">Next&nbsp;&rsaquo;</a></p></div></nav>'
+pagy/extras/bulma::#pagy_bulma_combo_nav_js#test_0001_renders first page 2: '<nav
+  id="test-nav-id" class="pagy-bulma-combo-nav-js" aria-label="pagination"><div class="field
+  is-grouped is-grouped-centered" role="group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><p
+  class="control"><a class="button" disabled>&lsaquo;&nbsp;Prev</a></p><div class="pagy-combo-input
+  control level is-mobile"><label>Page <input class="input" type="number" min="1"
+  max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:0 0.3rem;"></label>
+  of 6</div><p class="control"><a href="/foo?page=2"  link-extra rel="next" class="button"
+  aria-label="next page">Next&nbsp;&rsaquo;</a></p></div></nav>'
 pagy/extras/bulma::#pagy_bulma_nav_js#test_0001_renders first page 1: <nav class="pagy-njs
   pagy-bulma-nav-js pagination is-centered" aria-label="pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a
   class=\&quot;pagination-previous\&quot; disabled>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=2\&quot;   rel=\&quot;next\&quot;
@@ -141,19 +71,18 @@ pagy/extras/bulma::#pagy_bulma_nav_js#test_0001_renders first page 2: <nav id="t
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
   is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
   class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav_js#test_0002_renders intermediate page 1: <nav
-  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
-  class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous page\&quot;>&lsaquo;&nbsp;Prev</a><a
-  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; class=\&quot;pagination-next\&quot;
-  aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link\&quot;
+pagy/extras/bulma::#pagy_bulma_nav_js#test_0004_renders with :steps 1: <nav class="pagy-njs
+  pagy-bulma-nav-js pagination is-centered" aria-label="pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a
+  href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot;
+  aria-label=\&quot;previous page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot;
+  class=\&quot;pagination-next\&quot; aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul
+  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link\&quot;
   aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link is-current\&quot;
   aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
-  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav_js#test_0002_renders intermediate page 2: <nav
-  id="test-nav-id" class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_nav_js#test_0004_renders with :steps 2: <nav id="test-nav-id"
+  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
   data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;  link-extra
   rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
   page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;  link-extra
@@ -164,18 +93,19 @@ pagy/extras/bulma::#pagy_bulma_nav_js#test_0002_renders intermediate page 2: <na
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
   is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
   class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav_js#test_0004_renders with :steps 1: <nav class="pagy-njs
-  pagy-bulma-nav-js pagination is-centered" aria-label="pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a
-  href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot;
-  aria-label=\&quot;previous page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot;
-  class=\&quot;pagination-next\&quot; aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul
-  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link\&quot;
+pagy/extras/bulma::#pagy_bulma_nav_js#test_0002_renders intermediate page 1: <nav
+  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
+  class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous page\&quot;>&lsaquo;&nbsp;Prev</a><a
+  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; class=\&quot;pagination-next\&quot;
+  aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link\&quot;
   aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;   class=\&quot;pagination-link is-current\&quot;
   aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
-  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></nav>
-pagy/extras/bulma::#pagy_bulma_nav_js#test_0004_renders with :steps 2: <nav id="test-nav-id"
-  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_nav_js#test_0002_renders intermediate page 2: <nav
+  id="test-nav-id" class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
   data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;  link-extra
   rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
   page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;  link-extra
@@ -206,3 +136,73 @@ pagy/extras/bulma::#pagy_bulma_nav_js#test_0003_renders last page 2: <nav id="te
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
   is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
   class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0003_renders last page 1: <nav class="pagy-bulma-nav
+  pagination is-centered" aria-label="pagination"><a href="/foo?page=49"   rel="prev"
+  class="pagination-previous" aria-label="previous page">&lsaquo;&nbsp;Prev</a><a
+  class="pagination-next" disabled>Next&nbsp;&rsaquo;</a><ul class="pagination-list"><li><a
+  href="/foo?page=1"   class="pagination-link" aria-label="goto page 1">1</a></li><li><span
+  class="pagination-ellipsis">&hellip;</span></li><li><a href="/foo?page=46"   class="pagination-link"
+  aria-label="goto page 46">46</a></li><li><a href="/foo?page=47"   class="pagination-link"
+  aria-label="goto page 47">47</a></li><li><a href="/foo?page=48"   class="pagination-link"
+  aria-label="goto page 48">48</a></li><li><a href="/foo?page=49"   rel="prev" class="pagination-link"
+  aria-label="goto page 49">49</a></li><li><a href="/foo?page=50"   class="pagination-link
+  is-current" aria-label="page 50" aria-current="page">50</a></li></ul></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0003_renders last page 2: <nav id="test-nav-id"
+  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=49\&quot;  link-extra
+  rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
+  page\&quot;>&lsaquo;&nbsp;Prev</a><a class=\&quot;pagination-next\&quot; disabled>Next&nbsp;&rsaquo;</a><ul
+  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  class=\&quot;pagination-link\&quot; aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
+  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
+  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0001_renders first page 1: <nav class="pagy-bulma-nav
+  pagination is-centered" aria-label="pagination"><a class="pagination-previous" disabled>&lsaquo;&nbsp;Prev</a><a
+  href="/foo?page=2"   rel="next" class="pagination-next" aria-label="next page">Next&nbsp;&rsaquo;</a><ul
+  class="pagination-list"><li><a href="/foo?page=1"   class="pagination-link is-current"
+  aria-label="page 1" aria-current="page">1</a></li><li><a href="/foo?page=2"   rel="next"
+  class="pagination-link" aria-label="goto page 2">2</a></li><li><a href="/foo?page=3"   class="pagination-link"
+  aria-label="goto page 3">3</a></li><li><a href="/foo?page=4"   class="pagination-link"
+  aria-label="goto page 4">4</a></li><li><a href="/foo?page=5"   class="pagination-link"
+  aria-label="goto page 5">5</a></li><li><span class="pagination-ellipsis">&hellip;</span></li><li><a
+  href="/foo?page=50"   class="pagination-link" aria-label="goto page 50">50</a></li></ul></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0001_renders first page 2: <nav id="test-nav-id"
+  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a class=\&quot;pagination-previous\&quot;
+  disabled>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=2\&quot;  link-extra rel=\&quot;next\&quot;
+  class=\&quot;pagination-next\&quot; aria-label=\&quot;next page\&quot;>Next&nbsp;&rsaquo;</a><ul
+  class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  class=\&quot;pagination-link\&quot; aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
+  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
+  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0002_renders intermediate page 1: <nav class="pagy-bulma-nav
+  pagination is-centered" aria-label="pagination"><a href="/foo?page=19"   rel="prev"
+  class="pagination-previous" aria-label="previous page">&lsaquo;&nbsp;Prev</a><a
+  href="/foo?page=21"   rel="next" class="pagination-next" aria-label="next page">Next&nbsp;&rsaquo;</a><ul
+  class="pagination-list"><li><a href="/foo?page=1"   class="pagination-link" aria-label="goto
+  page 1">1</a></li><li><span class="pagination-ellipsis">&hellip;</span></li><li><a
+  href="/foo?page=16"   class="pagination-link" aria-label="goto page 16">16</a></li><li><a
+  href="/foo?page=17"   class="pagination-link" aria-label="goto page 17">17</a></li><li><a
+  href="/foo?page=18"   class="pagination-link" aria-label="goto page 18">18</a></li><li><a
+  href="/foo?page=19"   rel="prev" class="pagination-link" aria-label="goto page 19">19</a></li><li><a
+  href="/foo?page=20"   class="pagination-link is-current" aria-label="page 20" aria-current="page">20</a></li><li><a
+  href="/foo?page=21"   rel="next" class="pagination-link" aria-label="goto page 21">21</a></li><li><a
+  href="/foo?page=22"   class="pagination-link" aria-label="goto page 22">22</a></li><li><a
+  href="/foo?page=23"   class="pagination-link" aria-label="goto page 23">23</a></li><li><a
+  href="/foo?page=24"   class="pagination-link" aria-label="goto page 24">24</a></li><li><span
+  class="pagination-ellipsis">&hellip;</span></li><li><a href="/foo?page=50"   class="pagination-link"
+  aria-label="goto page 50">50</a></li></ul></nav>
+pagy/extras/bulma::#pagy_bulma_nav#test_0002_renders intermediate page 2: <nav id="test-nav-id"
+  class="pagy-njs pagy-bulma-nav-js pagination is-centered" aria-label="pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a href=\&quot;/foo?page=19\&quot;  link-extra
+  rel=\&quot;prev\&quot; class=\&quot;pagination-previous\&quot; aria-label=\&quot;previous
+  page\&quot;>&lsaquo;&nbsp;Prev</a><a href=\&quot;/foo?page=21\&quot;  link-extra
+  rel=\&quot;next\&quot; class=\&quot;pagination-next\&quot; aria-label=\&quot;next
+  page\&quot;>Next&nbsp;&rsaquo;</a><ul class=\&quot;pagination-list\&quot;>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link\&quot;
+  aria-label=\&quot;goto page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra class=\&quot;pagination-link
+  is-current\&quot; aria-current=\&quot;page\&quot; aria-label=\&quot;page __pagy_page__\&quot;>__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li><span
+  class=\&quot;pagination-ellipsis\&quot;>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;</ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
diff --git a/test/pagy/extras/elasticsearch_rails_test.rb.yml b/test/pagy/extras/elasticsearch_rails_test.rb.yml
index dbdd6b52b..b1d792ce3 100644
--- a/test/pagy/extras/elasticsearch_rails_test.rb.yml
+++ b/test/pagy/extras/elasticsearch_rails_test.rb.yml
@@ -63,18 +63,7 @@ pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch_rails#t
 - R-b-998
 - R-b-999
 - R-b-1000
-pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0004_paginates with overflow 1:
-- R-b-991
-- R-b-992
-- R-b-993
-- R-b-994
-- R-b-995
-- R-b-996
-- R-b-997
-- R-b-998
-- R-b-999
-- R-b-1000
-pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0002_paginates records with defaults 1:
+pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0001_paginates response with defaults 1:
 - R-a-41
 - R-a-42
 - R-a-43
@@ -95,7 +84,18 @@ pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#
 - R-a-58
 - R-a-59
 - R-a-60
-pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0001_paginates response with defaults 1:
+pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0003_paginates with vars 1:
+- R-b-11
+- R-b-12
+- R-b-13
+- R-b-14
+- R-b-15
+- R-b-16
+- R-b-17
+- R-b-18
+- R-b-19
+- R-b-20
+pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0002_paginates records with defaults 1:
 - R-a-41
 - R-a-42
 - R-a-43
@@ -116,14 +116,14 @@ pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#
 - R-a-58
 - R-a-59
 - R-a-60
-pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0003_paginates with vars 1:
-- R-b-11
-- R-b-12
-- R-b-13
-- R-b-14
-- R-b-15
-- R-b-16
-- R-b-17
-- R-b-18
-- R-b-19
-- R-b-20
+pagy/extras/elasticsearch_rails::controller_methods::#pagy_elasticsearch7_rails#test_0004_paginates with overflow 1:
+- R-b-991
+- R-b-992
+- R-b-993
+- R-b-994
+- R-b-995
+- R-b-996
+- R-b-997
+- R-b-998
+- R-b-999
+- R-b-1000
diff --git a/test/pagy/extras/foundation_test.rb.yml b/test/pagy/extras/foundation_test.rb.yml
index 20dcec9f8..2bc42d50b 100644
--- a/test/pagy/extras/foundation_test.rb.yml
+++ b/test/pagy/extras/foundation_test.rb.yml
@@ -1,4 +1,54 @@
 ---
+pagy/extras/foundation::#pagy_foundation_nav#test_0001_renders first page 1: <nav
+  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev
+  disabled">&lsaquo;&nbsp;Prev</li><li class="current">1</li><li><a href="/foo?page=2"   rel="next"
+  >2</a></li><li><a href="/foo?page=3"   >3</a></li><li><a href="/foo?page=4"   >4</a></li><li><a
+  href="/foo?page=5"   >5</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
+  href="/foo?page=50"   >50</a></li><li class="next"><a href="/foo?page=2"   rel="next"
+  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav#test_0001_renders first page 2: <nav
+  id="test-nav-id" class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li
+  class="prev disabled">&lsaquo;&nbsp;Prev</li><li class="current">1</li><li><a href="/foo?page=2"  link-extra
+  rel="next" >2</a></li><li><a href="/foo?page=3"  link-extra >3</a></li><li><a href="/foo?page=4"  link-extra
+  >4</a></li><li><a href="/foo?page=5"  link-extra >5</a></li><li class="ellipsis
+  gap" aria-hidden="true"></li><li><a href="/foo?page=50"  link-extra >50</a></li><li
+  class="next"><a href="/foo?page=2"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav#test_0002_renders intermediate page 1: <nav
+  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev"><a
+  href="/foo?page=19"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
+  href="/foo?page=1"   >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
+  href="/foo?page=16"   >16</a></li><li><a href="/foo?page=17"   >17</a></li><li><a
+  href="/foo?page=18"   >18</a></li><li><a href="/foo?page=19"   rel="prev" >19</a></li><li
+  class="current">20</li><li><a href="/foo?page=21"   rel="next" >21</a></li><li><a
+  href="/foo?page=22"   >22</a></li><li><a href="/foo?page=23"   >23</a></li><li><a
+  href="/foo?page=24"   >24</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
+  href="/foo?page=50"   >50</a></li><li class="next"><a href="/foo?page=21"   rel="next"
+  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav#test_0002_renders intermediate page 2: <nav
+  id="test-nav-id" class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li
+  class="prev"><a href="/foo?page=19"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
+  href="/foo?page=1"  link-extra >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
+  href="/foo?page=16"  link-extra >16</a></li><li><a href="/foo?page=17"  link-extra
+  >17</a></li><li><a href="/foo?page=18"  link-extra >18</a></li><li><a href="/foo?page=19"  link-extra
+  rel="prev" >19</a></li><li class="current">20</li><li><a href="/foo?page=21"  link-extra
+  rel="next" >21</a></li><li><a href="/foo?page=22"  link-extra >22</a></li><li><a
+  href="/foo?page=23"  link-extra >23</a></li><li><a href="/foo?page=24"  link-extra
+  >24</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a href="/foo?page=50"  link-extra
+  >50</a></li><li class="next"><a href="/foo?page=21"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav#test_0003_renders last page 1: <nav class="pagy-foundation-nav"
+  aria-label="Pagination"><ul class="pagination"><li class="prev"><a href="/foo?page=49"   rel="prev"
+  aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a href="/foo?page=1"   >1</a></li><li
+  class="ellipsis gap" aria-hidden="true"></li><li><a href="/foo?page=46"   >46</a></li><li><a
+  href="/foo?page=47"   >47</a></li><li><a href="/foo?page=48"   >48</a></li><li><a
+  href="/foo?page=49"   rel="prev" >49</a></li><li class="current">50</li><li class="next
+  disabled">Next&nbsp;&rsaquo;</li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav#test_0003_renders last page 2: <nav id="test-nav-id"
+  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev"><a
+  href="/foo?page=49"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
+  href="/foo?page=1"  link-extra >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
+  href="/foo?page=46"  link-extra >46</a></li><li><a href="/foo?page=47"  link-extra
+  >47</a></li><li><a href="/foo?page=48"  link-extra >48</a></li><li><a href="/foo?page=49"  link-extra
+  rel="prev" >49</a></li><li class="current">50</li><li class="next disabled">Next&nbsp;&rsaquo;</li></ul></nav>
 pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0002_renders intermediate page 1: '<nav
   class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group"
   data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
@@ -17,24 +67,6 @@ pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0002_renders intermed
   type="number" min="1" max="6" value="3" style="width: 2rem; padding: 0 0.3rem; margin:
   0 0.3rem;"></label> of 6</span><a href="/foo?page=4"  link-extra rel="next" style="margin-bottom:
   0" aria-label="next" class="next button primary">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0001_renders first page 1: '<nav
-  class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group"
-  data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
-  none;\&quot;></a>&quot;]"><a style="margin-bottom: 0" class="prev button primary
-  disabled" href="#">&lsaquo;&nbsp;Prev</a><span class="input-group-label"><label>Page
-  <input class="input-group-field cell shrink" type="number" min="1" max="6" value="1"
-  style="width: 2rem; padding: 0 0.3rem; margin: 0 0.3rem;"></label> of 6</span><a
-  href="/foo?page=2"   rel="next" style="margin-bottom: 0" aria-label="next" class="next
-  button primary">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0001_renders first page 2: '<nav
-  id="test-nav-id" class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div
-  class="input-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  style=\&quot;display: none;\&quot;></a>&quot;]"><a style="margin-bottom: 0" class="prev
-  button primary disabled" href="#">&lsaquo;&nbsp;Prev</a><span class="input-group-label"><label>Page
-  <input class="input-group-field cell shrink" type="number" min="1" max="6" value="1"
-  style="width: 2rem; padding: 0 0.3rem; margin: 0 0.3rem;"></label> of 6</span><a
-  href="/foo?page=2"  link-extra rel="next" style="margin-bottom: 0" aria-label="next"
-  class="next button primary">Next&nbsp;&rsaquo;</a></div></nav>'
 pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0003_renders last page 1: '<nav
   class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group"
   data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
@@ -53,40 +85,24 @@ pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0003_renders last pag
   type="number" min="1" max="6" value="6" style="width: 2rem; padding: 0 0.3rem; margin:
   0 0.3rem;"></label> of 6</span><a style="margin-bottom: 0" class="next button primary
   disabled" href="#">Next&nbsp;&rsaquo;</a></div></nav>'
-pagy/extras/foundation::#pagy_foundation_nav_js#test_0003_renders last page 1: <nav
-  class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
-  class=\&quot;pagination\&quot;><li class=\&quot;prev\&quot;><a href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot;
-  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;current\&quot;>50</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
-  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;next disabled\&quot;>Next&nbsp;&rsaquo;</li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
-pagy/extras/foundation::#pagy_foundation_nav_js#test_0003_renders last page 2: <nav
-  id="test-nav-id" class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
-  class=\&quot;prev\&quot;><a href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot;
-  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;current\&quot;>50</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
-  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;next disabled\&quot;>Next&nbsp;&rsaquo;</li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></nav>
-pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders first page 1: <nav
-  class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
-  class=\&quot;pagination\&quot;><li class=\&quot;prev disabled\&quot;>&lsaquo;&nbsp;Prev</li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;current\&quot;>1</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
-  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;next\&quot;><a href=\&quot;/foo?page=2\&quot;   rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders first page 2: <nav
-  id="test-nav-id" class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
-  class=\&quot;prev disabled\&quot;>&lsaquo;&nbsp;Prev</li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;current\&quot;>1</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
-  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;next\&quot;><a href=\&quot;/foo?page=2\&quot;  link-extra rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0001_renders first page 1: '<nav
+  class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div class="input-group"
+  data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
+  none;\&quot;></a>&quot;]"><a style="margin-bottom: 0" class="prev button primary
+  disabled" href="#">&lsaquo;&nbsp;Prev</a><span class="input-group-label"><label>Page
+  <input class="input-group-field cell shrink" type="number" min="1" max="6" value="1"
+  style="width: 2rem; padding: 0 0.3rem; margin: 0 0.3rem;"></label> of 6</span><a
+  href="/foo?page=2"   rel="next" style="margin-bottom: 0" aria-label="next" class="next
+  button primary">Next&nbsp;&rsaquo;</a></div></nav>'
+pagy/extras/foundation::#pagy_foundation_combo_nav_js#test_0001_renders first page 2: '<nav
+  id="test-nav-id" class="pagy-foundation-combo-nav-js" aria-label="Pagination"><div
+  class="input-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  style=\&quot;display: none;\&quot;></a>&quot;]"><a style="margin-bottom: 0" class="prev
+  button primary disabled" href="#">&lsaquo;&nbsp;Prev</a><span class="input-group-label"><label>Page
+  <input class="input-group-field cell shrink" type="number" min="1" max="6" value="1"
+  style="width: 2rem; padding: 0 0.3rem; margin: 0 0.3rem;"></label> of 6</span><a
+  href="/foo?page=2"  link-extra rel="next" style="margin-bottom: 0" aria-label="next"
+  class="next button primary">Next&nbsp;&rsaquo;</a></div></nav>'
 pagy/extras/foundation::#pagy_foundation_nav_js#test_0002_renders intermediate page 1: <nav
   class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
   class=\&quot;pagination\&quot;><li class=\&quot;prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
@@ -125,53 +141,37 @@ pagy/extras/foundation::#pagy_foundation_nav_js#test_0004_renders with :steps 2:
   gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
   class=\&quot;next\&quot;><a href=\&quot;/foo?page=21\&quot;  link-extra rel=\&quot;next\&quot;
   aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0001_renders first page 1: <nav
-  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev
-  disabled">&lsaquo;&nbsp;Prev</li><li class="current">1</li><li><a href="/foo?page=2"   rel="next"
-  >2</a></li><li><a href="/foo?page=3"   >3</a></li><li><a href="/foo?page=4"   >4</a></li><li><a
-  href="/foo?page=5"   >5</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
-  href="/foo?page=50"   >50</a></li><li class="next"><a href="/foo?page=2"   rel="next"
-  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0001_renders first page 2: <nav
-  id="test-nav-id" class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li
-  class="prev disabled">&lsaquo;&nbsp;Prev</li><li class="current">1</li><li><a href="/foo?page=2"  link-extra
-  rel="next" >2</a></li><li><a href="/foo?page=3"  link-extra >3</a></li><li><a href="/foo?page=4"  link-extra
-  >4</a></li><li><a href="/foo?page=5"  link-extra >5</a></li><li class="ellipsis
-  gap" aria-hidden="true"></li><li><a href="/foo?page=50"  link-extra >50</a></li><li
-  class="next"><a href="/foo?page=2"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0002_renders intermediate page 1: <nav
-  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev"><a
-  href="/foo?page=19"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
-  href="/foo?page=1"   >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
-  href="/foo?page=16"   >16</a></li><li><a href="/foo?page=17"   >17</a></li><li><a
-  href="/foo?page=18"   >18</a></li><li><a href="/foo?page=19"   rel="prev" >19</a></li><li
-  class="current">20</li><li><a href="/foo?page=21"   rel="next" >21</a></li><li><a
-  href="/foo?page=22"   >22</a></li><li><a href="/foo?page=23"   >23</a></li><li><a
-  href="/foo?page=24"   >24</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
-  href="/foo?page=50"   >50</a></li><li class="next"><a href="/foo?page=21"   rel="next"
-  aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0002_renders intermediate page 2: <nav
-  id="test-nav-id" class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li
-  class="prev"><a href="/foo?page=19"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
-  href="/foo?page=1"  link-extra >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
-  href="/foo?page=16"  link-extra >16</a></li><li><a href="/foo?page=17"  link-extra
-  >17</a></li><li><a href="/foo?page=18"  link-extra >18</a></li><li><a href="/foo?page=19"  link-extra
-  rel="prev" >19</a></li><li class="current">20</li><li><a href="/foo?page=21"  link-extra
-  rel="next" >21</a></li><li><a href="/foo?page=22"  link-extra >22</a></li><li><a
-  href="/foo?page=23"  link-extra >23</a></li><li><a href="/foo?page=24"  link-extra
-  >24</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a href="/foo?page=50"  link-extra
-  >50</a></li><li class="next"><a href="/foo?page=21"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></li></ul></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0003_renders last page 1: <nav class="pagy-foundation-nav"
-  aria-label="Pagination"><ul class="pagination"><li class="prev"><a href="/foo?page=49"   rel="prev"
-  aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a href="/foo?page=1"   >1</a></li><li
-  class="ellipsis gap" aria-hidden="true"></li><li><a href="/foo?page=46"   >46</a></li><li><a
-  href="/foo?page=47"   >47</a></li><li><a href="/foo?page=48"   >48</a></li><li><a
-  href="/foo?page=49"   rel="prev" >49</a></li><li class="current">50</li><li class="next
-  disabled">Next&nbsp;&rsaquo;</li></ul></nav>
-pagy/extras/foundation::#pagy_foundation_nav#test_0003_renders last page 2: <nav id="test-nav-id"
-  class="pagy-foundation-nav" aria-label="Pagination"><ul class="pagination"><li class="prev"><a
-  href="/foo?page=49"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></li><li><a
-  href="/foo?page=1"  link-extra >1</a></li><li class="ellipsis gap" aria-hidden="true"></li><li><a
-  href="/foo?page=46"  link-extra >46</a></li><li><a href="/foo?page=47"  link-extra
-  >47</a></li><li><a href="/foo?page=48"  link-extra >48</a></li><li><a href="/foo?page=49"  link-extra
-  rel="prev" >49</a></li><li class="current">50</li><li class="next disabled">Next&nbsp;&rsaquo;</li></ul></nav>
+pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders first page 1: <nav
+  class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
+  class=\&quot;pagination\&quot;><li class=\&quot;prev disabled\&quot;>&lsaquo;&nbsp;Prev</li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;current\&quot;>1</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
+  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;next\&quot;><a href=\&quot;/foo?page=2\&quot;   rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/foundation::#pagy_foundation_nav_js#test_0001_renders first page 2: <nav
+  id="test-nav-id" class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
+  class=\&quot;prev disabled\&quot;>&lsaquo;&nbsp;Prev</li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;current\&quot;>1</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
+  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;next\&quot;><a href=\&quot;/foo?page=2\&quot;  link-extra rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/foundation::#pagy_foundation_nav_js#test_0003_renders last page 1: <nav
+  class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
+  class=\&quot;pagination\&quot;><li class=\&quot;prev\&quot;><a href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot;
+  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;current\&quot;>50</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
+  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;next disabled\&quot;>Next&nbsp;&rsaquo;</li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/foundation::#pagy_foundation_nav_js#test_0003_renders last page 2: <nav
+  id="test-nav-id" class="pagy-njs pagy-foundation-nav-js" aria-label="Pagination"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
+  class=\&quot;prev\&quot;><a href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot;
+  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;current\&quot;>50</li>&quot;,&quot;gap&quot;:&quot;<li class=\&quot;ellipsis
+  gap\&quot; aria-hidden=\&quot;true\&quot;></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;next disabled\&quot;>Next&nbsp;&rsaquo;</li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></nav>
diff --git a/test/pagy/extras/headers_test.rb.yml b/test/pagy/extras/headers_test.rb.yml
index 2f0bca16b..700d3c505 100644
--- a/test/pagy/extras/headers_test.rb.yml
+++ b/test/pagy/extras/headers_test.rb.yml
@@ -17,20 +17,6 @@ pagy/extras/headers::#pagy_headers#test_0001_returns the full headers hash 2:
   Page-Items: '20'
   Total-Pages: '50'
   Total-Count: '1000'
-pagy/extras/headers::#pagy_headers#test_0002_returns custom headers hash 1:
-  Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=2>;
-    rel="prev", <https://example.com:8080/foo?page=4>; rel="next", <https://example.com:8080/foo?page=50>;
-    rel="last"
-  Per-Page: '20'
-  Total: '1000'
-pagy/extras/headers::#pagy_headers#test_0002_returns custom headers hash 2:
-  Link:
-    first: https://example.com:8080/foo?page=1
-    prev: https://example.com:8080/foo?page=2
-    next: https://example.com:8080/foo?page=4
-    last: https://example.com:8080/foo?page=50
-  Per-Page: '20'
-  Total: '1000'
 pagy/extras/headers::#pagy_headers#test_0003_returns the countless headers hash 1:
   Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=2>;
     rel="prev", <https://example.com:8080/foo?page=4>; rel="next"
@@ -43,35 +29,49 @@ pagy/extras/headers::#pagy_headers#test_0003_returns the countless headers hash
     next: https://example.com:8080/foo?page=4
   Current-Page: '3'
   Page-Items: '20'
-pagy/extras/headers::#pagy_headers#test_0005_omit next on last page 1:
-  Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=49>;
-    rel="prev", <https://example.com:8080/foo?page=50>; rel="last"
-  Current-Page: '50'
+pagy/extras/headers::#pagy_headers#test_0004_omit prev on first page 1:
+  Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=2>;
+    rel="next", <https://example.com:8080/foo?page=50>; rel="last"
+  Current-Page: '1'
   Page-Items: '20'
   Total-Pages: '50'
   Total-Count: '1000'
-pagy/extras/headers::#pagy_headers#test_0005_omit next on last page 2:
+pagy/extras/headers::#pagy_headers#test_0004_omit prev on first page 2:
   Link:
     first: https://example.com:8080/foo?page=1
-    prev: https://example.com:8080/foo?page=49
+    next: https://example.com:8080/foo?page=2
     last: https://example.com:8080/foo?page=50
-  Current-Page: '50'
+  Current-Page: '1'
   Page-Items: '20'
   Total-Pages: '50'
   Total-Count: '1000'
-pagy/extras/headers::#pagy_headers#test_0004_omit prev on first page 1:
+pagy/extras/headers::#pagy_headers#test_0002_returns custom headers hash 1:
   Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=2>;
-    rel="next", <https://example.com:8080/foo?page=50>; rel="last"
-  Current-Page: '1'
+    rel="prev", <https://example.com:8080/foo?page=4>; rel="next", <https://example.com:8080/foo?page=50>;
+    rel="last"
+  Per-Page: '20'
+  Total: '1000'
+pagy/extras/headers::#pagy_headers#test_0002_returns custom headers hash 2:
+  Link:
+    first: https://example.com:8080/foo?page=1
+    prev: https://example.com:8080/foo?page=2
+    next: https://example.com:8080/foo?page=4
+    last: https://example.com:8080/foo?page=50
+  Per-Page: '20'
+  Total: '1000'
+pagy/extras/headers::#pagy_headers#test_0005_omit next on last page 1:
+  Link: <https://example.com:8080/foo?page=1>; rel="first", <https://example.com:8080/foo?page=49>;
+    rel="prev", <https://example.com:8080/foo?page=50>; rel="last"
+  Current-Page: '50'
   Page-Items: '20'
   Total-Pages: '50'
   Total-Count: '1000'
-pagy/extras/headers::#pagy_headers#test_0004_omit prev on first page 2:
+pagy/extras/headers::#pagy_headers#test_0005_omit next on last page 2:
   Link:
     first: https://example.com:8080/foo?page=1
-    next: https://example.com:8080/foo?page=2
+    prev: https://example.com:8080/foo?page=49
     last: https://example.com:8080/foo?page=50
-  Current-Page: '1'
+  Current-Page: '50'
   Page-Items: '20'
   Total-Pages: '50'
   Total-Count: '1000'
diff --git a/test/pagy/extras/items_trim_test.rb.yml b/test/pagy/extras/items_trim_test.rb.yml
index 3e158a02f..e7f1da588 100644
--- a/test/pagy/extras/items_trim_test.rb.yml
+++ b/test/pagy/extras/items_trim_test.rb.yml
@@ -1,12 +1,4 @@
 ---
-pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 1: '<a
-  href="/foo?page=__pagy_page__&items=20"   style="display: none;"></a>'
-pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 2: '<a
-  href="/foo?p=__pagy_page__&items=20"   style="display: none;"></a>'
-pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 3: '<a
-  href="/foo?page=__pagy_page__&i=20"   style="display: none;"></a>'
-pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 4: '<a
-  href="/foo?p=__pagy_page__&i=20"   style="display: none;"></a>'
 pagy/extras/items_trim#test_0001_renders items selector with trim 1: '<span id="test-id"
   class="pagy-items-selector-js" data-pagy-json="[&quot;items_selector&quot;,41,&quot;<a
   href=\&quot;/foo?page=__pagy_page__&items=__pagy_items__\&quot;   style=\&quot;display:
@@ -25,3 +17,11 @@ pagy/extras/items_trim#test_0001_renders items selector with trim 3: '<span id="
   none;\&quot;></a>&quot;,&quot;page&quot;]"><label>Show <input type="number" min="1"
   max="100" value="20" style="padding: 0; text-align: center; width: 3rem;"> products
   per page</label></span>'
+pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 1: '<a
+  href="/foo?page=__pagy_page__&items=20"   style="display: none;"></a>'
+pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 2: '<a
+  href="/foo?p=__pagy_page__&items=20"   style="display: none;"></a>'
+pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 3: '<a
+  href="/foo?page=__pagy_page__&i=20"   style="display: none;"></a>'
+pagy/extras/items_trim::#pagy_marked_link#test_0001_should return the marked link 4: '<a
+  href="/foo?p=__pagy_page__&i=20"   style="display: none;"></a>'
diff --git a/test/pagy/extras/materialize_test.rb.yml b/test/pagy/extras/materialize_test.rb.yml
index e3856f90c..8fc56ab94 100644
--- a/test/pagy/extras/materialize_test.rb.yml
+++ b/test/pagy/extras/materialize_test.rb.yml
@@ -1,28 +1,71 @@
 ---
-pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0003_renders last page 1: '<div
-  class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div
-  class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px;
-  background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin:
-  0" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
-  none;\&quot;></a>&quot;]"><li class="waves-effect prev" style="vertical-align: middle;"><a
-  href="/foo?page=5"   rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><div
-  class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px"><label>Page
-  <input type="number" class="browser-default" min="1" max="6" value="6" style="padding:
-  2px; border: none; border-radius: 2px; text-align: center; width: 2rem;"></label>
-  of 6</div><li class="next disabled" style="vertical-align: middle;"><a href="#"><i
-  class="material-icons">chevron_right</i></a></li></ul></div>'
-pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0003_renders last page 2: '<div
-  id="test-nav-id" class="pagy-materialize-combo-nav-js pagination" role="navigation"
-  aria-label="pager"><div class="pagy-compact-chip" role="group" style="height: 35px;
-  border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination"
-  style="margin: 0" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  style=\&quot;display: none;\&quot;></a>&quot;]"><li class="waves-effect prev" style="vertical-align:
-  middle;"><a href="/foo?page=5"  link-extra rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><div
-  class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px"><label>Page
-  <input type="number" class="browser-default" min="1" max="6" value="6" style="padding:
-  2px; border: none; border-radius: 2px; text-align: center; width: 2rem;"></label>
-  of 6</div><li class="next disabled" style="vertical-align: middle;"><a href="#"><i
-  class="material-icons">chevron_right</i></a></li></ul></div>'
+pagy/extras/materialize::#pagy_materialize_nav#test_0002_renders intermediate page 1: <div
+  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="waves-effect prev"><a href="/foo?page=19"   rel="prev"
+  aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li class="waves-effect"><a
+  href="/foo?page=1"   >1</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
+  class="waves-effect"><a href="/foo?page=16"   >16</a></li><li class="waves-effect"><a
+  href="/foo?page=17"   >17</a></li><li class="waves-effect"><a href="/foo?page=18"   >18</a></li><li
+  class="waves-effect"><a href="/foo?page=19"   rel="prev" >19</a></li><li class="active"><a
+  href="/foo?page=20"   >20</a></li><li class="waves-effect"><a href="/foo?page=21"   rel="next"
+  >21</a></li><li class="waves-effect"><a href="/foo?page=22"   >22</a></li><li class="waves-effect"><a
+  href="/foo?page=23"   >23</a></li><li class="waves-effect"><a href="/foo?page=24"   >24</a></li><li
+  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"   >50</a></li><li
+  class="waves-effect next"><a href="/foo?page=21"   rel="next" aria-label="next"><i
+  class="material-icons">chevron_right</i></a></li></ul></div>
+pagy/extras/materialize::#pagy_materialize_nav#test_0002_renders intermediate page 2: <div
+  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="waves-effect prev"><a href="/foo?page=19"  link-extra
+  rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li
+  class="waves-effect"><a href="/foo?page=1"  link-extra >1</a></li><li class="gap
+  disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=16"  link-extra
+  >16</a></li><li class="waves-effect"><a href="/foo?page=17"  link-extra >17</a></li><li
+  class="waves-effect"><a href="/foo?page=18"  link-extra >18</a></li><li class="waves-effect"><a
+  href="/foo?page=19"  link-extra rel="prev" >19</a></li><li class="active"><a href="/foo?page=20"  link-extra
+  >20</a></li><li class="waves-effect"><a href="/foo?page=21"  link-extra rel="next"
+  >21</a></li><li class="waves-effect"><a href="/foo?page=22"  link-extra >22</a></li><li
+  class="waves-effect"><a href="/foo?page=23"  link-extra >23</a></li><li class="waves-effect"><a
+  href="/foo?page=24"  link-extra >24</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
+  class="waves-effect"><a href="/foo?page=50"  link-extra >50</a></li><li class="waves-effect
+  next"><a href="/foo?page=21"  link-extra rel="next" aria-label="next"><i class="material-icons">chevron_right</i></a></li></ul></div>
+pagy/extras/materialize::#pagy_materialize_nav#test_0003_renders last page 1: <div
+  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="waves-effect prev"><a href="/foo?page=49"   rel="prev"
+  aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li class="waves-effect"><a
+  href="/foo?page=1"   >1</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
+  class="waves-effect"><a href="/foo?page=46"   >46</a></li><li class="waves-effect"><a
+  href="/foo?page=47"   >47</a></li><li class="waves-effect"><a href="/foo?page=48"   >48</a></li><li
+  class="waves-effect"><a href="/foo?page=49"   rel="prev" >49</a></li><li class="active"><a
+  href="/foo?page=50"   >50</a></li><li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li></ul></div>
+pagy/extras/materialize::#pagy_materialize_nav#test_0003_renders last page 2: <div
+  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="waves-effect prev"><a href="/foo?page=49"  link-extra
+  rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li
+  class="waves-effect"><a href="/foo?page=1"  link-extra >1</a></li><li class="gap
+  disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=46"  link-extra
+  >46</a></li><li class="waves-effect"><a href="/foo?page=47"  link-extra >47</a></li><li
+  class="waves-effect"><a href="/foo?page=48"  link-extra >48</a></li><li class="waves-effect"><a
+  href="/foo?page=49"  link-extra rel="prev" >49</a></li><li class="active"><a href="/foo?page=50"  link-extra
+  >50</a></li><li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li></ul></div>
+pagy/extras/materialize::#pagy_materialize_nav#test_0001_renders first page 1: <div
+  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li><li
+  class="active"><a href="/foo?page=1"   >1</a></li><li class="waves-effect"><a href="/foo?page=2"   rel="next"
+  >2</a></li><li class="waves-effect"><a href="/foo?page=3"   >3</a></li><li class="waves-effect"><a
+  href="/foo?page=4"   >4</a></li><li class="waves-effect"><a href="/foo?page=5"   >5</a></li><li
+  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"   >50</a></li><li
+  class="waves-effect next"><a href="/foo?page=2"   rel="next" aria-label="next"><i
+  class="material-icons">chevron_right</i></a></li></ul></div>
+pagy/extras/materialize::#pagy_materialize_nav#test_0001_renders first page 2: <div
+  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
+  class="pagination"><li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li><li
+  class="active"><a href="/foo?page=1"  link-extra >1</a></li><li class="waves-effect"><a
+  href="/foo?page=2"  link-extra rel="next" >2</a></li><li class="waves-effect"><a
+  href="/foo?page=3"  link-extra >3</a></li><li class="waves-effect"><a href="/foo?page=4"  link-extra
+  >4</a></li><li class="waves-effect"><a href="/foo?page=5"  link-extra >5</a></li><li
+  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"  link-extra
+  >50</a></li><li class="waves-effect next"><a href="/foo?page=2"  link-extra rel="next"
+  aria-label="next"><i class="material-icons">chevron_right</i></a></li></ul></div>
 pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0001_renders first page 1: '<div
   class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div
   class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px;
@@ -71,6 +114,49 @@ pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0002_renders interm
   2px; border: none; border-radius: 2px; text-align: center; width: 2rem;"></label>
   of 6</div><li class="waves-effect next" style="vertical-align: middle;"><a href="/foo?page=4"  link-extra
   rel="next" aria-label="next"><i class="material-icons">chevron_right</i></a></li></ul></div>'
+pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0003_renders last page 1: '<div
+  class="pagy-materialize-combo-nav-js pagination" role="navigation" aria-label="pager"><div
+  class="pagy-compact-chip" role="group" style="height: 35px; border-radius: 18px;
+  background: #e4e4e4; display: inline-block;"><ul class="pagination" style="margin:
+  0" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
+  none;\&quot;></a>&quot;]"><li class="waves-effect prev" style="vertical-align: middle;"><a
+  href="/foo?page=5"   rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><div
+  class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px"><label>Page
+  <input type="number" class="browser-default" min="1" max="6" value="6" style="padding:
+  2px; border: none; border-radius: 2px; text-align: center; width: 2rem;"></label>
+  of 6</div><li class="next disabled" style="vertical-align: middle;"><a href="#"><i
+  class="material-icons">chevron_right</i></a></li></ul></div>'
+pagy/extras/materialize::#pagy_materialize_combo_nav_js#test_0003_renders last page 2: '<div
+  id="test-nav-id" class="pagy-materialize-combo-nav-js pagination" role="navigation"
+  aria-label="pager"><div class="pagy-compact-chip" role="group" style="height: 35px;
+  border-radius: 18px; background: #e4e4e4; display: inline-block;"><ul class="pagination"
+  style="margin: 0" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  style=\&quot;display: none;\&quot;></a>&quot;]"><li class="waves-effect prev" style="vertical-align:
+  middle;"><a href="/foo?page=5"  link-extra rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><div
+  class="pagy-combo-input btn-flat" style="cursor: default; padding: 0px"><label>Page
+  <input type="number" class="browser-default" min="1" max="6" value="6" style="padding:
+  2px; border: none; border-radius: 2px; text-align: center; width: 2rem;"></label>
+  of 6</div><li class="next disabled" style="vertical-align: middle;"><a href="#"><i
+  class="material-icons">chevron_right</i></a></li></ul></div>'
+pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders first page 1: <div
+  class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
+  class=\&quot;pagination\&quot;><li class=\&quot;prev disabled\&quot;><a href=\&quot;#\&quot;><i
+  class=\&quot;material-icons\&quot;>chevron_left</i></a></li>&quot;,&quot;link&quot;:&quot;<li
+  class=\&quot;waves-effect\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
+  class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;waves-effect next\&quot;><a href=\&quot;/foo?page=2\&quot;   rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></div>
+pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders first page 2: <div
+  id="test-nav-id" class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager"
+  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
+  class=\&quot;prev disabled\&quot;><a href=\&quot;#\&quot;><i class=\&quot;material-icons\&quot;>chevron_left</i></a></li>&quot;,&quot;link&quot;:&quot;<li
+  class=\&quot;waves-effect\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li class=\&quot;active\&quot;><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
+  class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;waves-effect next\&quot;><a href=\&quot;/foo?page=2\&quot;  link-extra
+  rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></div>
 pagy/extras/materialize::#pagy_materialize_nav_js#test_0002_renders intermediate page 1: <div
   class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
   class=\&quot;pagination\&quot;><li class=\&quot;waves-effect prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
@@ -109,25 +195,6 @@ pagy/extras/materialize::#pagy_materialize_nav_js#test_0003_renders last page 2:
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
   class=\&quot;next disabled\&quot;><a href=\&quot;#\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></div>
-pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders first page 1: <div
-  class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
-  class=\&quot;pagination\&quot;><li class=\&quot;prev disabled\&quot;><a href=\&quot;#\&quot;><i
-  class=\&quot;material-icons\&quot;>chevron_left</i></a></li>&quot;,&quot;link&quot;:&quot;<li
-  class=\&quot;waves-effect\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;active\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
-  class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;waves-effect next\&quot;><a href=\&quot;/foo?page=2\&quot;   rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></div>
-pagy/extras/materialize::#pagy_materialize_nav_js#test_0001_renders first page 2: <div
-  id="test-nav-id" class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager"
-  data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul class=\&quot;pagination\&quot;><li
-  class=\&quot;prev disabled\&quot;><a href=\&quot;#\&quot;><i class=\&quot;material-icons\&quot;>chevron_left</i></a></li>&quot;,&quot;link&quot;:&quot;<li
-  class=\&quot;waves-effect\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li class=\&quot;active\&quot;><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;gap&quot;:&quot;<li
-  class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;waves-effect next\&quot;><a href=\&quot;/foo?page=2\&quot;  link-extra
-  rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></div>
 pagy/extras/materialize::#pagy_materialize_nav_js#test_0004_renders with :steps 1: <div
   class="pagy-njs pagy-materialize-nav-js" role="navigation" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<ul
   class=\&quot;pagination\&quot;><li class=\&quot;waves-effect prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
@@ -148,70 +215,3 @@ pagy/extras/materialize::#pagy_materialize_nav_js#test_0004_renders with :steps
   class=\&quot;gap disabled\&quot;><a href=\&quot;#\&quot;>&hellip;</a></li>&quot;,&quot;after&quot;:&quot;<li
   class=\&quot;waves-effect next\&quot;><a href=\&quot;/foo?page=21\&quot;  link-extra
   rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;><i class=\&quot;material-icons\&quot;>chevron_right</i></a></li></ul>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0003_renders last page 1: <div
-  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="waves-effect prev"><a href="/foo?page=49"   rel="prev"
-  aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li class="waves-effect"><a
-  href="/foo?page=1"   >1</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
-  class="waves-effect"><a href="/foo?page=46"   >46</a></li><li class="waves-effect"><a
-  href="/foo?page=47"   >47</a></li><li class="waves-effect"><a href="/foo?page=48"   >48</a></li><li
-  class="waves-effect"><a href="/foo?page=49"   rel="prev" >49</a></li><li class="active"><a
-  href="/foo?page=50"   >50</a></li><li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li></ul></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0003_renders last page 2: <div
-  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="waves-effect prev"><a href="/foo?page=49"  link-extra
-  rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li
-  class="waves-effect"><a href="/foo?page=1"  link-extra >1</a></li><li class="gap
-  disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=46"  link-extra
-  >46</a></li><li class="waves-effect"><a href="/foo?page=47"  link-extra >47</a></li><li
-  class="waves-effect"><a href="/foo?page=48"  link-extra >48</a></li><li class="waves-effect"><a
-  href="/foo?page=49"  link-extra rel="prev" >49</a></li><li class="active"><a href="/foo?page=50"  link-extra
-  >50</a></li><li class="next disabled"><a href="#"><i class="material-icons">chevron_right</i></a></li></ul></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0001_renders first page 1: <div
-  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li><li
-  class="active"><a href="/foo?page=1"   >1</a></li><li class="waves-effect"><a href="/foo?page=2"   rel="next"
-  >2</a></li><li class="waves-effect"><a href="/foo?page=3"   >3</a></li><li class="waves-effect"><a
-  href="/foo?page=4"   >4</a></li><li class="waves-effect"><a href="/foo?page=5"   >5</a></li><li
-  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"   >50</a></li><li
-  class="waves-effect next"><a href="/foo?page=2"   rel="next" aria-label="next"><i
-  class="material-icons">chevron_right</i></a></li></ul></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0001_renders first page 2: <div
-  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="prev disabled"><a href="#"><i class="material-icons">chevron_left</i></a></li><li
-  class="active"><a href="/foo?page=1"  link-extra >1</a></li><li class="waves-effect"><a
-  href="/foo?page=2"  link-extra rel="next" >2</a></li><li class="waves-effect"><a
-  href="/foo?page=3"  link-extra >3</a></li><li class="waves-effect"><a href="/foo?page=4"  link-extra
-  >4</a></li><li class="waves-effect"><a href="/foo?page=5"  link-extra >5</a></li><li
-  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"  link-extra
-  >50</a></li><li class="waves-effect next"><a href="/foo?page=2"  link-extra rel="next"
-  aria-label="next"><i class="material-icons">chevron_right</i></a></li></ul></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0002_renders intermediate page 1: <div
-  class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="waves-effect prev"><a href="/foo?page=19"   rel="prev"
-  aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li class="waves-effect"><a
-  href="/foo?page=1"   >1</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
-  class="waves-effect"><a href="/foo?page=16"   >16</a></li><li class="waves-effect"><a
-  href="/foo?page=17"   >17</a></li><li class="waves-effect"><a href="/foo?page=18"   >18</a></li><li
-  class="waves-effect"><a href="/foo?page=19"   rel="prev" >19</a></li><li class="active"><a
-  href="/foo?page=20"   >20</a></li><li class="waves-effect"><a href="/foo?page=21"   rel="next"
-  >21</a></li><li class="waves-effect"><a href="/foo?page=22"   >22</a></li><li class="waves-effect"><a
-  href="/foo?page=23"   >23</a></li><li class="waves-effect"><a href="/foo?page=24"   >24</a></li><li
-  class="gap disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=50"   >50</a></li><li
-  class="waves-effect next"><a href="/foo?page=21"   rel="next" aria-label="next"><i
-  class="material-icons">chevron_right</i></a></li></ul></div>
-pagy/extras/materialize::#pagy_materialize_nav#test_0002_renders intermediate page 2: <div
-  id="test-nav-id" class="pagy-materialize-nav pagination" role="navigation" aria-label="pager"><ul
-  class="pagination"><li class="waves-effect prev"><a href="/foo?page=19"  link-extra
-  rel="prev" aria-label="previous"><i class="material-icons">chevron_left</i></a></li><li
-  class="waves-effect"><a href="/foo?page=1"  link-extra >1</a></li><li class="gap
-  disabled"><a href="#">&hellip;</a></li><li class="waves-effect"><a href="/foo?page=16"  link-extra
-  >16</a></li><li class="waves-effect"><a href="/foo?page=17"  link-extra >17</a></li><li
-  class="waves-effect"><a href="/foo?page=18"  link-extra >18</a></li><li class="waves-effect"><a
-  href="/foo?page=19"  link-extra rel="prev" >19</a></li><li class="active"><a href="/foo?page=20"  link-extra
-  >20</a></li><li class="waves-effect"><a href="/foo?page=21"  link-extra rel="next"
-  >21</a></li><li class="waves-effect"><a href="/foo?page=22"  link-extra >22</a></li><li
-  class="waves-effect"><a href="/foo?page=23"  link-extra >23</a></li><li class="waves-effect"><a
-  href="/foo?page=24"  link-extra >24</a></li><li class="gap disabled"><a href="#">&hellip;</a></li><li
-  class="waves-effect"><a href="/foo?page=50"  link-extra >50</a></li><li class="waves-effect
-  next"><a href="/foo?page=21"  link-extra rel="next" aria-label="next"><i class="material-icons">chevron_right</i></a></li></ul></div>
diff --git a/test/pagy/extras/metadata_test.rb.yml b/test/pagy/extras/metadata_test.rb.yml
index dc9376570..41cb4e58f 100644
--- a/test/pagy/extras/metadata_test.rb.yml
+++ b/test/pagy/extras/metadata_test.rb.yml
@@ -1,4 +1,23 @@
 ---
+pagy/extras/metadata::#pagy_metadata#test_0001_defines all metadata 1:
+- :scaffold_url
+- :first_url
+- :prev_url
+- :page_url
+- :next_url
+- :last_url
+- :count
+- :page
+- :items
+- :vars
+- :pages
+- :last
+- :from
+- :to
+- :prev
+- :next
+- :series
+- :sequels
 pagy/extras/metadata::#pagy_metadata#test_0002_returns the full pagy metadata 1:
   :scaffold_url: "/foo?page=__pagy_page__"
   :first_url: "/foo?page=1"
@@ -79,22 +98,3 @@ pagy/extras/metadata::#pagy_metadata#test_0004_returns only specific metadata 1:
   :prev: 2
   :next: 4
   :pages: 50
-pagy/extras/metadata::#pagy_metadata#test_0001_defines all metadata 1:
-- :scaffold_url
-- :first_url
-- :prev_url
-- :page_url
-- :next_url
-- :last_url
-- :count
-- :page
-- :items
-- :vars
-- :pages
-- :last
-- :from
-- :to
-- :prev
-- :next
-- :series
-- :sequels
diff --git a/test/pagy/extras/navs_test.rb.yml b/test/pagy/extras/navs_test.rb.yml
index 4c76b9a87..9dced5e3a 100644
--- a/test/pagy/extras/navs_test.rb.yml
+++ b/test/pagy/extras/navs_test.rb.yml
@@ -1,18 +1,19 @@
 ---
-pagy/extras/navs::#pagy_combo_nav_js#test_0003_renders last page 1: '<nav class="pagy-combo-nav-js
-  pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
+pagy/extras/navs::#pagy_combo_nav_js#test_0002_renders intermediate page 1: '<nav
+  class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><span
-  class="page prev"><a href="/foo?page=5"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  class="page prev"><a href="/foo?page=2"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
   <span class="pagy-combo-input" style="margin: 0 0.6rem;"><label>Page <input type="number"
-  min="1" max="6" value="6" style="padding: 0; text-align: center; width: 2rem;"></label>
-  of 6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>'
-pagy/extras/navs::#pagy_combo_nav_js#test_0003_renders last page 2: '<nav id="test-nav-id"
-  class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
+  min="1" max="6" value="3" style="padding: 0; text-align: center; width: 2rem;"></label>
+  of 6</span> <span class="page next"><a href="/foo?page=4"   rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>'
+pagy/extras/navs::#pagy_combo_nav_js#test_0002_renders intermediate page 2: '<nav
+  id="test-nav-id" class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><span
-  class="page prev"><a href="/foo?page=5"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  class="page prev"><a href="/foo?page=2"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
   <span class="pagy-combo-input" style="margin: 0 0.6rem;"><label>Page <input type="number"
-  min="1" max="6" value="6" style="padding: 0; text-align: center; width: 2rem;"></label>
-  of 6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>'
+  min="1" max="6" value="3" style="padding: 0; text-align: center; width: 2rem;"></label>
+  of 6</span> <span class="page next"><a href="/foo?page=4"  link-extra rel="next"
+  aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>'
 pagy/extras/navs::#pagy_combo_nav_js#test_0001_renders first page 1: '<nav class="pagy-combo-nav-js
   pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><span
@@ -27,22 +28,37 @@ pagy/extras/navs::#pagy_combo_nav_js#test_0001_renders first page 2: '<nav id="t
   style="margin: 0 0.6rem;"><label>Page <input type="number" min="1" max="6" value="1"
   style="padding: 0; text-align: center; width: 2rem;"></label> of 6</span> <span
   class="page next"><a href="/foo?page=2"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>'
-pagy/extras/navs::#pagy_combo_nav_js#test_0002_renders intermediate page 1: '<nav
-  class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
+pagy/extras/navs::#pagy_combo_nav_js#test_0003_renders last page 1: '<nav class="pagy-combo-nav-js
+  pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><span
-  class="page prev"><a href="/foo?page=2"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  class="page prev"><a href="/foo?page=5"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
   <span class="pagy-combo-input" style="margin: 0 0.6rem;"><label>Page <input type="number"
-  min="1" max="6" value="3" style="padding: 0; text-align: center; width: 2rem;"></label>
-  of 6</span> <span class="page next"><a href="/foo?page=4"   rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>'
-pagy/extras/navs::#pagy_combo_nav_js#test_0002_renders intermediate page 2: '<nav
-  id="test-nav-id" class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
+  min="1" max="6" value="6" style="padding: 0; text-align: center; width: 2rem;"></label>
+  of 6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>'
+pagy/extras/navs::#pagy_combo_nav_js#test_0003_renders last page 2: '<nav id="test-nav-id"
+  class="pagy-combo-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><span
-  class="page prev"><a href="/foo?page=2"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  class="page prev"><a href="/foo?page=5"  link-extra rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
   <span class="pagy-combo-input" style="margin: 0 0.6rem;"><label>Page <input type="number"
-  min="1" max="6" value="3" style="padding: 0; text-align: center; width: 2rem;"></label>
-  of 6</span> <span class="page next"><a href="/foo?page=4"  link-extra rel="next"
-  aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>'
-pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 1: <nav class="pagy-njs
+  min="1" max="6" value="6" style="padding: 0; text-align: center; width: 2rem;"></label>
+  of 6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>'
+pagy/extras/navs::#pagy_nav_js#test_0003_renders last page 1: <nav class="pagy-njs
+  pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
+  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot;
+  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
+  class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></span>
+  &quot;,&quot;active&quot;:&quot;<span class=\&quot;page active\&quot;>50</span>
+  &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
+  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next disabled\&quot;>Next&nbsp;&rsaquo;</span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/navs::#pagy_nav_js#test_0003_renders last page 2: <nav id="test-nav-id"
+  class="pagy-njs pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
+  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot;
+  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
+  class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
+  >__pagy_page__</a></span> &quot;,&quot;active&quot;:&quot;<span class=\&quot;page
+  active\&quot;>50</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
+  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next disabled\&quot;>Next&nbsp;&rsaquo;</span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></nav>
+pagy/extras/navs::#pagy_nav_js#test_0002_renders intermediate page 1: <nav class="pagy-njs
   pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
   class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
   aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
@@ -50,8 +66,8 @@ pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 1: <nav class="pagy
   &quot;,&quot;active&quot;:&quot;<span class=\&quot;page active\&quot;>20</span>
   &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
   &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></nav>
-pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 2: <nav id="test-nav-id"
+  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
+pagy/extras/navs::#pagy_nav_js#test_0002_renders intermediate page 2: <nav id="test-nav-id"
   class="pagy-njs pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
   class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;  link-extra rel=\&quot;prev\&quot;
   aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
@@ -60,22 +76,24 @@ pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 2: <nav id="test-na
   active\&quot;>20</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
   &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;  link-extra
   rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/navs::#pagy_nav_js#test_0003_renders last page 1: <nav class="pagy-njs
+pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 1: <nav class="pagy-njs
   pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
-  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot;
+  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
   aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
   class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></span>
-  &quot;,&quot;active&quot;:&quot;<span class=\&quot;page active\&quot;>50</span>
+  &quot;,&quot;active&quot;:&quot;<span class=\&quot;page active\&quot;>20</span>
   &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
-  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next disabled\&quot;>Next&nbsp;&rsaquo;</span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></nav>
-pagy/extras/navs::#pagy_nav_js#test_0003_renders last page 2: <nav id="test-nav-id"
+  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></nav>
+pagy/extras/navs::#pagy_nav_js#test_0004_renders with :steps 2: <nav id="test-nav-id"
   class="pagy-njs pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
-  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot;
+  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;  link-extra rel=\&quot;prev\&quot;
   aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
   class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
   >__pagy_page__</a></span> &quot;,&quot;active&quot;:&quot;<span class=\&quot;page
-  active\&quot;>50</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
-  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next disabled\&quot;>Next&nbsp;&rsaquo;</span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></nav>
+  active\&quot;>20</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
+  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;  link-extra
+  rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
 pagy/extras/navs::#pagy_nav_js#test_0001_renders first page 1: <nav class="pagy-njs
   pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
   class=\&quot;page prev disabled\&quot;>&lsaquo;&nbsp;Prev</span> &quot;,&quot;link&quot;:&quot;<span
@@ -92,21 +110,3 @@ pagy/extras/navs::#pagy_nav_js#test_0001_renders first page 2: <nav id="test-nav
   active\&quot;>1</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
   &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=2\&quot;  link-extra
   rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/navs::#pagy_nav_js#test_0002_renders intermediate page 1: <nav class="pagy-njs
-  pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
-  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot;
-  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
-  class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></span>
-  &quot;,&quot;active&quot;:&quot;<span class=\&quot;page active\&quot;>20</span>
-  &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
-  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></nav>
-pagy/extras/navs::#pagy_nav_js#test_0002_renders intermediate page 2: <nav id="test-nav-id"
-  class="pagy-njs pagy-nav-js pagination" aria-label="pager" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<span
-  class=\&quot;page prev\&quot;><a href=\&quot;/foo?page=19\&quot;  link-extra rel=\&quot;prev\&quot;
-  aria-label=\&quot;previous\&quot;>&lsaquo;&nbsp;Prev</a></span> &quot;,&quot;link&quot;:&quot;<span
-  class=\&quot;page\&quot;><a href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra
-  >__pagy_page__</a></span> &quot;,&quot;active&quot;:&quot;<span class=\&quot;page
-  active\&quot;>20</span> &quot;,&quot;gap&quot;:&quot;<span class=\&quot;page gap\&quot;>&hellip;</span>
-  &quot;,&quot;after&quot;:&quot;<span class=\&quot;page next\&quot;><a href=\&quot;/foo?page=21\&quot;  link-extra
-  rel=\&quot;next\&quot; aria-label=\&quot;next\&quot;>Next&nbsp;&rsaquo;</a></span>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></nav>
diff --git a/test/pagy/extras/semantic_test.rb.yml b/test/pagy/extras/semantic_test.rb.yml
index f36a337b4..db00b3bcd 100644
--- a/test/pagy/extras/semantic_test.rb.yml
+++ b/test/pagy/extras/semantic_test.rb.yml
@@ -1,53 +1,4 @@
 ---
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0002_renders intermediate page 1: '<div
-  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
-  none;\&quot;></a>&quot;]"><a href="/foo?page=2"  class="item"  rel="prev" aria-label="previous"><i
-  class="left small chevron icon"></i></a><div class="pagy-combo-input item"><label>Page
-  <input type="number" min="1" max="6" value="3" style="padding: 0; text-align: center;
-  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <a href="/foo?page=4"  class="item"  rel="next"
-  aria-label="next"><i class="right small chevron icon"></i></a></div>'
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0002_renders intermediate page 2: '<div
-  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
-  data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
-  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a href="/foo?page=2"  class="item"
-  link-extra rel="prev" aria-label="previous"><i class="left small chevron icon"></i></a><div
-  class="pagy-combo-input item"><label>Page <input type="number" min="1" max="6" value="3"
-  style="padding: 0; text-align: center; width: 2rem; margin: 0 0.3rem"></label> of
-  6</div> <a href="/foo?page=4"  class="item" link-extra rel="next" aria-label="next"><i
-  class="right small chevron icon"></i></a></div>'
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0003_renders last page 1: '<div
-  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
-  none;\&quot;></a>&quot;]"><a href="/foo?page=5"  class="item"  rel="prev" aria-label="previous"><i
-  class="left small chevron icon"></i></a><div class="pagy-combo-input item"><label>Page
-  <input type="number" min="1" max="6" value="6" style="padding: 0; text-align: center;
-  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <div class="item disabled"><i
-  class="right small chevron icon"></i></div></div>'
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0003_renders last page 2: '<div
-  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
-  data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
-  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a href="/foo?page=5"  class="item"
-  link-extra rel="prev" aria-label="previous"><i class="left small chevron icon"></i></a><div
-  class="pagy-combo-input item"><label>Page <input type="number" min="1" max="6" value="6"
-  style="padding: 0; text-align: center; width: 2rem; margin: 0 0.3rem"></label> of
-  6</div> <div class="item disabled"><i class="right small chevron icon"></i></div></div>'
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first page 1: '<div
-  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
-  none;\&quot;></a>&quot;]"><div class="item disabled"><i class="left small chevron
-  icon"></i></div><div class="pagy-combo-input item"><label>Page <input type="number"
-  min="1" max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:
-  0 0.3rem"></label> of 6</div> <a href="/foo?page=2"  class="item"  rel="next" aria-label="next"><i
-  class="right small chevron icon"></i></a></div>'
-pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first page 2: '<div
-  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
-  data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
-  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><div class="item disabled"><i
-  class="left small chevron icon"></i></div><div class="pagy-combo-input item"><label>Page
-  <input type="number" min="1" max="6" value="1" style="padding: 0; text-align: center;
-  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <a href="/foo?page=2"  class="item"
-  link-extra rel="next" aria-label="next"><i class="right small chevron icon"></i></a></div>'
 pagy/extras/semantic::#pagy_semantic_nav#test_0001_renders first page 1: <div class="pagy-semantic-nav
   ui pagination menu"><div class="item disabled"><i class="left small chevron icon"></i></div><a
   class="item active">1</a><a href="/foo?page=2"  class="item"  rel="next" >2</a><a
@@ -101,6 +52,70 @@ pagy/extras/semantic::#pagy_semantic_nav#test_0002_renders intermediate page 2:
   link-extra >24</a><div class="disabled item">&hellip;</div><a href="/foo?page=50"  class="item"
   link-extra >50</a><a href="/foo?page=21"  class="item" link-extra rel="next" aria-label="next"><i
   class="right small chevron icon"></i></a></div>
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first page 1: '<div
+  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
+  none;\&quot;></a>&quot;]"><div class="item disabled"><i class="left small chevron
+  icon"></i></div><div class="pagy-combo-input item"><label>Page <input type="number"
+  min="1" max="6" value="1" style="padding: 0; text-align: center; width: 2rem; margin:
+  0 0.3rem"></label> of 6</div> <a href="/foo?page=2"  class="item"  rel="next" aria-label="next"><i
+  class="right small chevron icon"></i></a></div>'
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0001_renders first page 2: '<div
+  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
+  data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
+  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><div class="item disabled"><i
+  class="left small chevron icon"></i></div><div class="pagy-combo-input item"><label>Page
+  <input type="number" min="1" max="6" value="1" style="padding: 0; text-align: center;
+  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <a href="/foo?page=2"  class="item"
+  link-extra rel="next" aria-label="next"><i class="right small chevron icon"></i></a></div>'
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0003_renders last page 1: '<div
+  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
+  none;\&quot;></a>&quot;]"><a href="/foo?page=5"  class="item"  rel="prev" aria-label="previous"><i
+  class="left small chevron icon"></i></a><div class="pagy-combo-input item"><label>Page
+  <input type="number" min="1" max="6" value="6" style="padding: 0; text-align: center;
+  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <div class="item disabled"><i
+  class="right small chevron icon"></i></div></div>'
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0003_renders last page 2: '<div
+  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
+  data-pagy-json="[&quot;combo_nav&quot;,6,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
+  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a href="/foo?page=5"  class="item"
+  link-extra rel="prev" aria-label="previous"><i class="left small chevron icon"></i></a><div
+  class="pagy-combo-input item"><label>Page <input type="number" min="1" max="6" value="6"
+  style="padding: 0; text-align: center; width: 2rem; margin: 0 0.3rem"></label> of
+  6</div> <div class="item disabled"><i class="right small chevron icon"></i></div></div>'
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0002_renders intermediate page 1: '<div
+  class="pagy-semantic-combo-nav-js ui compact menu" role="navigation" data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  style=\&quot;display:
+  none;\&quot;></a>&quot;]"><a href="/foo?page=2"  class="item"  rel="prev" aria-label="previous"><i
+  class="left small chevron icon"></i></a><div class="pagy-combo-input item"><label>Page
+  <input type="number" min="1" max="6" value="3" style="padding: 0; text-align: center;
+  width: 2rem; margin: 0 0.3rem"></label> of 6</div> <a href="/foo?page=4"  class="item"  rel="next"
+  aria-label="next"><i class="right small chevron icon"></i></a></div>'
+pagy/extras/semantic::#pagy_semantic_combo_nav_js#test_0002_renders intermediate page 2: '<div
+  id="test-nav-id" class="pagy-semantic-combo-nav-js ui compact menu" role="navigation"
+  data-pagy-json="[&quot;combo_nav&quot;,3,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;
+  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a href="/foo?page=2"  class="item"
+  link-extra rel="prev" aria-label="previous"><i class="left small chevron icon"></i></a><div
+  class="pagy-combo-input item"><label>Page <input type="number" min="1" max="6" value="3"
+  style="padding: 0; text-align: center; width: 2rem; margin: 0 0.3rem"></label> of
+  6</div> <a href="/foo?page=4"  class="item" link-extra rel="next" aria-label="next"><i
+  class="right small chevron icon"></i></a></div>'
+pagy/extras/semantic::#pagy_semantic_nav_js#test_0001_renders first page 1: <div class="pagy-njs
+  pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<div
+  class=\&quot;item disabled\&quot;><i class=\&quot;left small chevron icon\&quot;></i></div>&quot;,&quot;link&quot;:&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  >__pagy_page__</a>&quot;,&quot;active&quot;:&quot;<a
+  class=\&quot;item active\&quot;>1</a>&quot;,&quot;gap&quot;:&quot;<div class=\&quot;disabled
+  item\&quot;>&hellip;</div>&quot;,&quot;after&quot;:&quot;<a href=\&quot;/foo?page=2\&quot;  class=\&quot;item\&quot;  rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;><i class=\&quot;right small chevron icon\&quot;></i></a>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></div>
+pagy/extras/semantic::#pagy_semantic_nav_js#test_0001_renders first page 2: <div id="test-nav-id"
+  class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<div
+  class=\&quot;item disabled\&quot;><i class=\&quot;left small chevron icon\&quot;></i></div>&quot;,&quot;link&quot;:&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot; link-extra
+  >__pagy_page__</a>&quot;,&quot;active&quot;:&quot;<a class=\&quot;item active\&quot;>1</a>&quot;,&quot;gap&quot;:&quot;<div
+  class=\&quot;disabled item\&quot;>&hellip;</div>&quot;,&quot;after&quot;:&quot;<a
+  href=\&quot;/foo?page=2\&quot;  class=\&quot;item\&quot; link-extra rel=\&quot;next\&quot;
+  aria-label=\&quot;next\&quot;><i class=\&quot;right small chevron icon\&quot;></i></a>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></div>
 pagy/extras/semantic::#pagy_semantic_nav_js#test_0002_renders intermediate page 1: <div
   class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a
   href=\&quot;/foo?page=19\&quot;  class=\&quot;item\&quot;  rel=\&quot;prev\&quot;
@@ -134,21 +149,6 @@ pagy/extras/semantic::#pagy_semantic_nav_js#test_0003_renders last page 2: <div
   >__pagy_page__</a>&quot;,&quot;active&quot;:&quot;<a class=\&quot;item active\&quot;>50</a>&quot;,&quot;gap&quot;:&quot;<div
   class=\&quot;disabled item\&quot;>&hellip;</div>&quot;,&quot;after&quot;:&quot;<div
   class=\&quot;item disabled\&quot;><i class=\&quot;right small chevron icon\&quot;></i></div>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></div>
-pagy/extras/semantic::#pagy_semantic_nav_js#test_0001_renders first page 1: <div class="pagy-njs
-  pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<div
-  class=\&quot;item disabled\&quot;><i class=\&quot;left small chevron icon\&quot;></i></div>&quot;,&quot;link&quot;:&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot;  >__pagy_page__</a>&quot;,&quot;active&quot;:&quot;<a
-  class=\&quot;item active\&quot;>1</a>&quot;,&quot;gap&quot;:&quot;<div class=\&quot;disabled
-  item\&quot;>&hellip;</div>&quot;,&quot;after&quot;:&quot;<a href=\&quot;/foo?page=2\&quot;  class=\&quot;item\&quot;  rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;><i class=\&quot;right small chevron icon\&quot;></i></a>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,4,5,&quot;gap&quot;,50]}]"></div>
-pagy/extras/semantic::#pagy_semantic_nav_js#test_0001_renders first page 2: <div id="test-nav-id"
-  class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<div
-  class=\&quot;item disabled\&quot;><i class=\&quot;left small chevron icon\&quot;></i></div>&quot;,&quot;link&quot;:&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  class=\&quot;item\&quot; link-extra
-  >__pagy_page__</a>&quot;,&quot;active&quot;:&quot;<a class=\&quot;item active\&quot;>1</a>&quot;,&quot;gap&quot;:&quot;<div
-  class=\&quot;disabled item\&quot;>&hellip;</div>&quot;,&quot;after&quot;:&quot;<a
-  href=\&quot;/foo?page=2\&quot;  class=\&quot;item\&quot; link-extra rel=\&quot;next\&quot;
-  aria-label=\&quot;next\&quot;><i class=\&quot;right small chevron icon\&quot;></i></a>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></div>
 pagy/extras/semantic::#pagy_semantic_nav_js#test_0004_renders with :steps 1: <div
   class="pagy-njs pagy-semantic-nav-js ui pagination menu" role="navigation" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<a
   href=\&quot;/foo?page=19\&quot;  class=\&quot;item\&quot;  rel=\&quot;prev\&quot;
diff --git a/test/pagy/extras/shared_json_test.rb.yml b/test/pagy/extras/shared_json_test.rb.yml
index 41e885dd5..c3331c684 100644
--- a/test/pagy/extras/shared_json_test.rb.yml
+++ b/test/pagy/extras/shared_json_test.rb.yml
@@ -1,6 +1,6 @@
 ---
+pagy/extras/shared_json::#pagy_json_attr#test_0001_should use json 1: data-pagy-json="[&quot;test_function&quot;,&quot;some-string&quot;,123,true]"
 pagy/extras/shared_json::#pagy_marked_link#test_0001_should return only the "standard" link 1: '<a
   href="/foo?page=__pagy_page__"   style="display: none;"></a>'
 pagy/extras/shared_json::#pagy_marked_link#test_0001_should return only the "standard" link 2: '<a
   href="/foo?p=__pagy_page__"   style="display: none;"></a>'
-pagy/extras/shared_json::#pagy_json_attr#test_0001_should use json 1: data-pagy-json="[&quot;test_function&quot;,&quot;some-string&quot;,123,true]"
diff --git a/test/pagy/extras/support_test.rb.yml b/test/pagy/extras/support_test.rb.yml
index 8c68d4084..ce49c7001 100644
--- a/test/pagy/extras/support_test.rb.yml
+++ b/test/pagy/extras/support_test.rb.yml
@@ -1,20 +1,36 @@
 ---
-pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 1: <span
-  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
-pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 2: <span
-  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
-pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 3: <span
-  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  link-extra>NEXT</a></span>
-pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 4: <span
-  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  link-extra>NEXT</a></span>
-pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 1: <span
-  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
-pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 2: <span
-  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
-pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 3: <span
-  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  link-extra>NEXT</a></span>
-pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 4: <span
-  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  link-extra>NEXT</a></span>
+pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 1: <span
+  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 2: <span
+  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 3: <span
+  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 4: <span
+  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 1: <span
+  class="page prev disabled">&lsaquo;&nbsp;Prev</span>
+pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 2: <span
+  class="page prev disabled">&lsaquo;&nbsp;Prev</span>
+pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 3: <span
+  class="page prev disabled">PREV</span>
+pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 4: <span
+  class="page prev disabled">PREV</span>
+pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 1: <span
+  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 2: <span
+  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 3: <span
+  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 4: <span
+  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 1: <span
+  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 2: <span
+  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
+pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 3: <span
+  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 4: <span
+  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
 pagy/extras/support::#pagy_next_link#test_0002_renders the next link for page 3 1: <span
   class="page next"><a href="/foo?page=4" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
 pagy/extras/support::#pagy_next_link#test_0002_renders the next link for page 3 2: <span
@@ -23,6 +39,14 @@ pagy/extras/support::#pagy_next_link#test_0002_renders the next link for page 3
   class="page next"><a href="/foo?page=4" rel="next" aria-label="next"  link-extra>NEXT</a></span>
 pagy/extras/support::#pagy_next_link#test_0002_renders the next link for page 3 4: <span
   class="page next"><a href="/foo?page=4" rel="next" aria-label="next"  link-extra>NEXT</a></span>
+pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 1: <span
+  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
+pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 2: <span
+  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
+pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 3: <span
+  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  link-extra>NEXT</a></span>
+pagy/extras/support::#pagy_next_link#test_0003_renders the next link for page 6 4: <span
+  class="page next"><a href="/foo?page=7" rel="next" aria-label="next"  link-extra>NEXT</a></span>
 pagy/extras/support::#pagy_next_link#test_0004_renders the next link for last page 1: <span
   class="page next disabled">Next&nbsp;&rsaquo;</span>
 pagy/extras/support::#pagy_next_link#test_0004_renders the next link for last page 2: <span
@@ -31,6 +55,18 @@ pagy/extras/support::#pagy_next_link#test_0004_renders the next link for last pa
   class="page next disabled">NEXT</span>
 pagy/extras/support::#pagy_next_link#test_0004_renders the next link for last page 4: <span
   class="page next disabled">NEXT</span>
+pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 1: <span
+  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
+pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 2: <span
+  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  >Next&nbsp;&rsaquo;</a></span>
+pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 3: <span
+  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  link-extra>NEXT</a></span>
+pagy/extras/support::#pagy_next_link#test_0001_renders the next link for page 1 4: <span
+  class="page next"><a href="/foo?page=2" rel="next" aria-label="next"  link-extra>NEXT</a></span>
+pagy/extras/support::#pagy_prev_link_tag#test_0004_renders the prev link tag for last page 1: <link
+  href="/foo?page=49" rel="prev"/>
+pagy/extras/support::#pagy_prev_link_tag#test_0004_renders the prev link tag for last page 2: <link
+  href="/foo?page=49" rel="prev"/>
 pagy/extras/support::#pagy_prev_link_tag#test_0002_renders the prev link tag for page 3 1: <link
   href="/foo?page=2" rel="prev"/>
 pagy/extras/support::#pagy_prev_link_tag#test_0002_renders the prev link tag for page 3 2: <link
@@ -39,14 +75,6 @@ pagy/extras/support::#pagy_prev_link_tag#test_0003_renders the prev link tag for
   href="/foo?page=5" rel="prev"/>
 pagy/extras/support::#pagy_prev_link_tag#test_0003_renders the prev link tag for page 6 2: <link
   href="/foo?page=5" rel="prev"/>
-pagy/extras/support::#pagy_prev_link_tag#test_0004_renders the prev link tag for last page 1: <link
-  href="/foo?page=49" rel="prev"/>
-pagy/extras/support::#pagy_prev_link_tag#test_0004_renders the prev link tag for last page 2: <link
-  href="/foo?page=49" rel="prev"/>
-pagy/extras/support::#pagy_next_link_tag#test_0003_renders the next link tag for page 6 1: <link
-  href="/foo?page=7" rel="next"/>
-pagy/extras/support::#pagy_next_link_tag#test_0003_renders the next link tag for page 6 2: <link
-  href="/foo?page=7" rel="next"/>
 pagy/extras/support::#pagy_next_link_tag#test_0001_renders the next link tag for page 1 1: <link
   href="/foo?page=2" rel="next"/>
 pagy/extras/support::#pagy_next_link_tag#test_0001_renders the next link tag for page 1 2: <link
@@ -55,35 +83,7 @@ pagy/extras/support::#pagy_next_link_tag#test_0002_renders the next link tag for
   href="/foo?page=4" rel="next"/>
 pagy/extras/support::#pagy_next_link_tag#test_0002_renders the next link tag for page 3 2: <link
   href="/foo?page=4" rel="next"/>
-pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 1: <span
-  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 2: <span
-  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 3: <span
-  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
-pagy/extras/support::#pagy_prev_link#test_0004_renders the prev link for last page 4: <span
-  class="page prev"><a href="/foo?page=49" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
-pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 1: <span
-  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 2: <span
-  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 3: <span
-  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
-pagy/extras/support::#pagy_prev_link#test_0002_renders the prev link for page 3 4: <span
-  class="page prev"><a href="/foo?page=2" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
-pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 1: <span
-  class="page prev disabled">&lsaquo;&nbsp;Prev</span>
-pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 2: <span
-  class="page prev disabled">&lsaquo;&nbsp;Prev</span>
-pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 3: <span
-  class="page prev disabled">PREV</span>
-pagy/extras/support::#pagy_prev_link#test_0001_renders the prev link for page 1 4: <span
-  class="page prev disabled">PREV</span>
-pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 1: <span
-  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 2: <span
-  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  >&lsaquo;&nbsp;Prev</a></span>
-pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 3: <span
-  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
-pagy/extras/support::#pagy_prev_link#test_0003_renders the prev link for page 6 4: <span
-  class="page prev"><a href="/foo?page=5" rel="prev" aria-label="previous"  link-extra>PREV</a></span>
+pagy/extras/support::#pagy_next_link_tag#test_0003_renders the next link tag for page 6 1: <link
+  href="/foo?page=7" rel="next"/>
+pagy/extras/support::#pagy_next_link_tag#test_0003_renders the next link tag for page 6 2: <link
+  href="/foo?page=7" rel="next"/>
diff --git a/test/pagy/extras/uikit_test.rb.yml b/test/pagy/extras/uikit_test.rb.yml
index a277b2b8e..253e407aa 100644
--- a/test/pagy/extras/uikit_test.rb.yml
+++ b/test/pagy/extras/uikit_test.rb.yml
@@ -1,25 +1,19 @@
 ---
-pagy/extras/uikit::#pagy_uikit_nav#test_0002_renders intermediate page 1: <ul class="pagy-uikit-nav
-  uk-pagination uk-flex-center"><li><a href="/foo?page=19"   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
+pagy/extras/uikit::#pagy_uikit_nav#test_0003_renders last page 1: <ul class="pagy-uikit-nav
+  uk-pagination uk-flex-center"><li><a href="/foo?page=49"   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
   href="/foo?page=1"   >1</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
-  href="/foo?page=16"   >16</a></li><li><a href="/foo?page=17"   >17</a></li><li><a
-  href="/foo?page=18"   >18</a></li><li><a href="/foo?page=19"   rel="prev" >19</a></li><li
-  class="uk-active"><span>20</span></li><li><a href="/foo?page=21"   rel="next" >21</a></li><li><a
-  href="/foo?page=22"   >22</a></li><li><a href="/foo?page=23"   >23</a></li><li><a
-  href="/foo?page=24"   >24</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
-  href="/foo?page=50"   >50</a></li><li><a href="/foo?page=21"   rel="next" ><span
+  href="/foo?page=46"   >46</a></li><li><a href="/foo?page=47"   >47</a></li><li><a
+  href="/foo?page=48"   >48</a></li><li><a href="/foo?page=49"   rel="prev" >49</a></li><li
+  class="uk-active"><span>50</span></li><li class="uk-disabled"><a href="#"><span
   uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
-pagy/extras/uikit::#pagy_uikit_nav#test_0002_renders intermediate page 2: <ul id="test-nav-id"
-  class="pagy-uikit-nav uk-pagination uk-flex-center"><li><a href="/foo?page=19"  link-extra
+pagy/extras/uikit::#pagy_uikit_nav#test_0003_renders last page 2: <ul id="test-nav-id"
+  class="pagy-uikit-nav uk-pagination uk-flex-center"><li><a href="/foo?page=49"  link-extra
   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
   href="/foo?page=1"  link-extra >1</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
-  href="/foo?page=16"  link-extra >16</a></li><li><a href="/foo?page=17"  link-extra
-  >17</a></li><li><a href="/foo?page=18"  link-extra >18</a></li><li><a href="/foo?page=19"  link-extra
-  rel="prev" >19</a></li><li class="uk-active"><span>20</span></li><li><a href="/foo?page=21"  link-extra
-  rel="next" >21</a></li><li><a href="/foo?page=22"  link-extra >22</a></li><li><a
-  href="/foo?page=23"  link-extra >23</a></li><li><a href="/foo?page=24"  link-extra
-  >24</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a href="/foo?page=50"  link-extra
-  >50</a></li><li><a href="/foo?page=21"  link-extra rel="next" ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
+  href="/foo?page=46"  link-extra >46</a></li><li><a href="/foo?page=47"  link-extra
+  >47</a></li><li><a href="/foo?page=48"  link-extra >48</a></li><li><a href="/foo?page=49"  link-extra
+  rel="prev" >49</a></li><li class="uk-active"><span>50</span></li><li class="uk-disabled"><a
+  href="#"><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
 pagy/extras/uikit::#pagy_uikit_nav#test_0001_renders first page 1: <ul class="pagy-uikit-nav
   uk-pagination uk-flex-center"><li class="uk-disabled"><a href="#"><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li
   class="uk-active"><span>1</span></li><li><a href="/foo?page=2"   rel="next" >2</a></li><li><a
@@ -33,21 +27,41 @@ pagy/extras/uikit::#pagy_uikit_nav#test_0001_renders first page 2: <ul id="test-
   >3</a></li><li><a href="/foo?page=4"  link-extra >4</a></li><li><a href="/foo?page=5"  link-extra
   >5</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a href="/foo?page=50"  link-extra
   >50</a></li><li><a href="/foo?page=2"  link-extra rel="next" ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
-pagy/extras/uikit::#pagy_uikit_nav#test_0003_renders last page 1: <ul class="pagy-uikit-nav
-  uk-pagination uk-flex-center"><li><a href="/foo?page=49"   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
+pagy/extras/uikit::#pagy_uikit_nav#test_0002_renders intermediate page 1: <ul class="pagy-uikit-nav
+  uk-pagination uk-flex-center"><li><a href="/foo?page=19"   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
   href="/foo?page=1"   >1</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
-  href="/foo?page=46"   >46</a></li><li><a href="/foo?page=47"   >47</a></li><li><a
-  href="/foo?page=48"   >48</a></li><li><a href="/foo?page=49"   rel="prev" >49</a></li><li
-  class="uk-active"><span>50</span></li><li class="uk-disabled"><a href="#"><span
+  href="/foo?page=16"   >16</a></li><li><a href="/foo?page=17"   >17</a></li><li><a
+  href="/foo?page=18"   >18</a></li><li><a href="/foo?page=19"   rel="prev" >19</a></li><li
+  class="uk-active"><span>20</span></li><li><a href="/foo?page=21"   rel="next" >21</a></li><li><a
+  href="/foo?page=22"   >22</a></li><li><a href="/foo?page=23"   >23</a></li><li><a
+  href="/foo?page=24"   >24</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
+  href="/foo?page=50"   >50</a></li><li><a href="/foo?page=21"   rel="next" ><span
   uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
-pagy/extras/uikit::#pagy_uikit_nav#test_0003_renders last page 2: <ul id="test-nav-id"
-  class="pagy-uikit-nav uk-pagination uk-flex-center"><li><a href="/foo?page=49"  link-extra
+pagy/extras/uikit::#pagy_uikit_nav#test_0002_renders intermediate page 2: <ul id="test-nav-id"
+  class="pagy-uikit-nav uk-pagination uk-flex-center"><li><a href="/foo?page=19"  link-extra
   rel="prev" ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li><li><a
   href="/foo?page=1"  link-extra >1</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a
-  href="/foo?page=46"  link-extra >46</a></li><li><a href="/foo?page=47"  link-extra
-  >47</a></li><li><a href="/foo?page=48"  link-extra >48</a></li><li><a href="/foo?page=49"  link-extra
-  rel="prev" >49</a></li><li class="uk-active"><span>50</span></li><li class="uk-disabled"><a
-  href="#"><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
+  href="/foo?page=16"  link-extra >16</a></li><li><a href="/foo?page=17"  link-extra
+  >17</a></li><li><a href="/foo?page=18"  link-extra >18</a></li><li><a href="/foo?page=19"  link-extra
+  rel="prev" >19</a></li><li class="uk-active"><span>20</span></li><li><a href="/foo?page=21"  link-extra
+  rel="next" >21</a></li><li><a href="/foo?page=22"  link-extra >22</a></li><li><a
+  href="/foo?page=23"  link-extra >23</a></li><li><a href="/foo?page=24"  link-extra
+  >24</a></li><li class="uk-disabled"><span>&hellip;</span></li><li><a href="/foo?page=50"  link-extra
+  >50</a></li><li><a href="/foo?page=21"  link-extra rel="next" ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li></ul>
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0003_renders last page 1: <ul class="pagy-njs
+  pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
+  href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
+  class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;uk-disabled\&quot;><a href=\&quot;#\&quot;><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></ul>
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0003_renders last page 2: <ul id="test-nav-id"
+  class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
+  href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
+  class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
+  class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li
+  class=\&quot;uk-disabled\&quot;><a href=\&quot;#\&quot;><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></ul>
 pagy/extras/uikit::#pagy_uikit_nav_js#test_0001_renders first page 1: <ul class="pagy-njs
   pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><a href=\&quot;#\&quot;><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
@@ -62,61 +76,48 @@ pagy/extras/uikit::#pagy_uikit_nav_js#test_0001_renders first page 2: <ul id="te
   class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li><a
   href=\&quot;/foo?page=2\&quot;  link-extra rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[&quot;1&quot;,2,3,&quot;gap&quot;,50],&quot;600&quot;:[&quot;1&quot;,2,3,4,&quot;gap&quot;,50]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0004_renders with :steps 1: <ul class="pagy-njs
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0002_renders intermediate page 1: <ul class="pagy-njs
   pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
   href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
   class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li><a
-  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0004_renders with :steps 2: <ul id="test-nav-id"
+  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></ul>
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0002_renders intermediate page 2: <ul id="test-nav-id"
   class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
   href=\&quot;/foo?page=19\&quot;  link-extra rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
   class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li><a
   href=\&quot;/foo?page=21\&quot;  link-extra rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0002_renders intermediate page 1: <ul class="pagy-njs
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0004_renders with :steps 1: <ul class="pagy-njs
   pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
   href=\&quot;/foo?page=19\&quot;   rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
   class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li><a
-  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,16,17,18,19,&quot;20&quot;,21,22,23,24,&quot;gap&quot;,50]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0002_renders intermediate page 2: <ul id="test-nav-id"
+  href=\&quot;/foo?page=21\&quot;   rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;500&quot;:[1,2,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,49,50]}]"></ul>
+pagy/extras/uikit::#pagy_uikit_nav_js#test_0004_renders with :steps 2: <ul id="test-nav-id"
   class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
   href=\&quot;/foo?page=19\&quot;  link-extra rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
   href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
   class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
   class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li><a
   href=\&quot;/foo?page=21\&quot;  link-extra rel=\&quot;next\&quot; ><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,18,19,&quot;20&quot;,21,22,&quot;gap&quot;,50],&quot;600&quot;:[1,&quot;gap&quot;,17,18,19,&quot;20&quot;,21,22,23,&quot;gap&quot;,50]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0003_renders last page 1: <ul class="pagy-njs
-  pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
-  href=\&quot;/foo?page=49\&quot;   rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;   >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
-  class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;uk-disabled\&quot;><a href=\&quot;#\&quot;><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,46,47,48,49,&quot;50&quot;]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_nav_js#test_0003_renders last page 2: <ul id="test-nav-id"
-  class="pagy-njs pagy-uikit-nav-js uk-pagination uk-flex-center" data-pagy-json="[&quot;nav&quot;,{&quot;before&quot;:&quot;<li><a
-  href=\&quot;/foo?page=49\&quot;  link-extra rel=\&quot;prev\&quot; ><span uk-pagination-previous>&lsaquo;&nbsp;Prev</span></a></li>&quot;,&quot;link&quot;:&quot;<li><a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra >__pagy_page__</a></li>&quot;,&quot;active&quot;:&quot;<li
-  class=\&quot;uk-active\&quot;><span>__pagy_page__</span></li>&quot;,&quot;gap&quot;:&quot;<li
-  class=\&quot;uk-disabled\&quot;><span>&hellip;</span></li>&quot;,&quot;after&quot;:&quot;<li
-  class=\&quot;uk-disabled\&quot;><a href=\&quot;#\&quot;><span uk-pagination-next>Next&nbsp;&rsaquo;</span></a></li>&quot;},{&quot;0&quot;:[1,&quot;gap&quot;,48,49,&quot;50&quot;],&quot;600&quot;:[1,&quot;gap&quot;,47,48,49,&quot;50&quot;]}]"></ul>
-pagy/extras/uikit::#pagy_uikit_combo_nav#test_0003_renders last page 1: '<div class="pagy-uikit-combo-nav-js
-  uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,50,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
-  none;\&quot;></a>&quot;]"><a href="/foo?page=49"   rel="prev" class="uk-button uk-button-default">&lsaquo;&nbsp;Prev</a><div
-  class="uk-text-middle uk-margin-left uk-margin-right"><label>Page <input type="number"
-  min="1" max="50" value="50" class="uk-input" style="padding: 0; text-align: center;
-  width: 3rem;"></label> of 50</div><button class="uk-button uk-button-default" disabled>Next&nbsp;&rsaquo;</button></div>'
-pagy/extras/uikit::#pagy_uikit_combo_nav#test_0003_renders last page 2: '<div id="test-nav-id"
-  class="pagy-uikit-combo-nav-js uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,50,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a
-  href="/foo?page=49"  link-extra rel="prev" class="uk-button uk-button-default">&lsaquo;&nbsp;Prev</a><div
+pagy/extras/uikit::#pagy_uikit_combo_nav#test_0001_renders first page 1: '<div class="pagy-uikit-combo-nav-js
+  uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
+  none;\&quot;></a>&quot;]"><button class="uk-button uk-button-default" disabled>&lsaquo;&nbsp;Prev</button><div
   class="uk-text-middle uk-margin-left uk-margin-right"><label>Page <input type="number"
-  min="1" max="50" value="50" class="uk-input" style="padding: 0; text-align: center;
-  width: 3rem;"></label> of 50</div><button class="uk-button uk-button-default" disabled>Next&nbsp;&rsaquo;</button></div>'
+  min="1" max="50" value="1" class="uk-input" style="padding: 0; text-align: center;
+  width: 3rem;"></label> of 50</div><a href="/foo?page=2"   rel="next" class="uk-button
+  uk-button-default">Next&nbsp;&rsaquo;</a></div>'
+pagy/extras/uikit::#pagy_uikit_combo_nav#test_0001_renders first page 2: '<div id="test-nav-id"
+  class="pagy-uikit-combo-nav-js uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><button
+  class="uk-button uk-button-default" disabled>&lsaquo;&nbsp;Prev</button><div class="uk-text-middle
+  uk-margin-left uk-margin-right"><label>Page <input type="number" min="1" max="50"
+  value="1" class="uk-input" style="padding: 0; text-align: center; width: 3rem;"></label>
+  of 50</div><a href="/foo?page=2"  link-extra rel="next" class="uk-button uk-button-default">Next&nbsp;&rsaquo;</a></div>'
 pagy/extras/uikit::#pagy_uikit_combo_nav#test_0002_renders intermediate page 1: '<div
   class="pagy-uikit-combo-nav-js uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,20,&quot;<a
   href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display: none;\&quot;></a>&quot;]"><a
@@ -133,17 +134,16 @@ pagy/extras/uikit::#pagy_uikit_combo_nav#test_0002_renders intermediate page 2:
   min="1" max="50" value="20" class="uk-input" style="padding: 0; text-align: center;
   width: 3rem;"></label> of 50</div><a href="/foo?page=21"  link-extra rel="next"
   class="uk-button uk-button-default">Next&nbsp;&rsaquo;</a></div>'
-pagy/extras/uikit::#pagy_uikit_combo_nav#test_0001_renders first page 1: '<div class="pagy-uikit-combo-nav-js
-  uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
-  none;\&quot;></a>&quot;]"><button class="uk-button uk-button-default" disabled>&lsaquo;&nbsp;Prev</button><div
+pagy/extras/uikit::#pagy_uikit_combo_nav#test_0003_renders last page 1: '<div class="pagy-uikit-combo-nav-js
+  uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,50,&quot;<a href=\&quot;/foo?page=__pagy_page__\&quot;   style=\&quot;display:
+  none;\&quot;></a>&quot;]"><a href="/foo?page=49"   rel="prev" class="uk-button uk-button-default">&lsaquo;&nbsp;Prev</a><div
   class="uk-text-middle uk-margin-left uk-margin-right"><label>Page <input type="number"
-  min="1" max="50" value="1" class="uk-input" style="padding: 0; text-align: center;
-  width: 3rem;"></label> of 50</div><a href="/foo?page=2"   rel="next" class="uk-button
-  uk-button-default">Next&nbsp;&rsaquo;</a></div>'
-pagy/extras/uikit::#pagy_uikit_combo_nav#test_0001_renders first page 2: '<div id="test-nav-id"
-  class="pagy-uikit-combo-nav-js uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,1,&quot;<a
-  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><button
-  class="uk-button uk-button-default" disabled>&lsaquo;&nbsp;Prev</button><div class="uk-text-middle
-  uk-margin-left uk-margin-right"><label>Page <input type="number" min="1" max="50"
-  value="1" class="uk-input" style="padding: 0; text-align: center; width: 3rem;"></label>
-  of 50</div><a href="/foo?page=2"  link-extra rel="next" class="uk-button uk-button-default">Next&nbsp;&rsaquo;</a></div>'
+  min="1" max="50" value="50" class="uk-input" style="padding: 0; text-align: center;
+  width: 3rem;"></label> of 50</div><button class="uk-button uk-button-default" disabled>Next&nbsp;&rsaquo;</button></div>'
+pagy/extras/uikit::#pagy_uikit_combo_nav#test_0003_renders last page 2: '<div id="test-nav-id"
+  class="pagy-uikit-combo-nav-js uk-button-group" data-pagy-json="[&quot;combo_nav&quot;,50,&quot;<a
+  href=\&quot;/foo?page=__pagy_page__\&quot;  link-extra style=\&quot;display: none;\&quot;></a>&quot;]"><a
+  href="/foo?page=49"  link-extra rel="prev" class="uk-button uk-button-default">&lsaquo;&nbsp;Prev</a><div
+  class="uk-text-middle uk-margin-left uk-margin-right"><label>Page <input type="number"
+  min="1" max="50" value="50" class="uk-input" style="padding: 0; text-align: center;
+  width: 3rem;"></label> of 50</div><button class="uk-button uk-button-default" disabled>Next&nbsp;&rsaquo;</button></div>'
diff --git a/test/pagy/frontend_test.rb.yml b/test/pagy/frontend_test.rb.yml
index c3d21d0ad..b406f1b9d 100644
--- a/test/pagy/frontend_test.rb.yml
+++ b/test/pagy/frontend_test.rb.yml
@@ -1,4 +1,18 @@
 ---
+pagy/frontend::#pagy_nav#test_0003_renders page 6 1: <nav class="pagy-nav pagination"
+  aria-label="pager"><span class="page prev"><a href="/foo?page=5"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  <span class="page"><a href="/foo?page=1"   >1</a></span> <span class="page"><a href="/foo?page=2"   >2</a></span>
+  <span class="page"><a href="/foo?page=3"   >3</a></span> <span class="page"><a href="/foo?page=4"   >4</a></span>
+  <span class="page"><a href="/foo?page=5"   rel="prev" >5</a></span> <span class="page
+  active">6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>
+pagy/frontend::#pagy_nav#test_0003_renders page 6 2: <nav id="test-nav-id" class="pagy-nav
+  pagination" aria-label="pager"><span class="page prev"><a href="/foo?page=5"  link-extra
+  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span> <span class="page"><a
+  href="/foo?page=1"  link-extra >1</a></span> <span class="page"><a href="/foo?page=2"  link-extra
+  >2</a></span> <span class="page"><a href="/foo?page=3"  link-extra >3</a></span>
+  <span class="page"><a href="/foo?page=4"  link-extra >4</a></span> <span class="page"><a
+  href="/foo?page=5"  link-extra rel="prev" >5</a></span> <span class="page active">6</span>
+  <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>
 pagy/frontend::#pagy_nav#test_0004_renders page 10 1: <nav class="pagy-nav pagination"
   aria-label="pager"><span class="page prev"><a href="/foo?page=9"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
   <span class="page"><a href="/foo?page=1"   >1</a></span> <span class="page gap">&hellip;</span>
@@ -22,35 +36,6 @@ pagy/frontend::#pagy_nav#test_0004_renders page 10 2: <nav id="test-nav-id" clas
   <span class="page"><a href="/foo?page=14"  link-extra >14</a></span> <span class="page
   gap">&hellip;</span> <span class="page"><a href="/foo?page=50"  link-extra >50</a></span>
   <span class="page next"><a href="/foo?page=11"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
-pagy/frontend::#pagy_nav#test_0002_renders page 3 1: <nav class="pagy-nav pagination"
-  aria-label="pager"><span class="page prev"><a href="/foo?page=2"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
-  <span class="page"><a href="/foo?page=1"   >1</a></span> <span class="page"><a href="/foo?page=2"   rel="prev"
-  >2</a></span> <span class="page active">3</span> <span class="page"><a href="/foo?page=4"   rel="next"
-  >4</a></span> <span class="page"><a href="/foo?page=5"   >5</a></span> <span class="page"><a
-  href="/foo?page=6"   >6</a></span> <span class="page next"><a href="/foo?page=4"   rel="next"
-  aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
-pagy/frontend::#pagy_nav#test_0002_renders page 3 2: <nav id="test-nav-id" class="pagy-nav
-  pagination" aria-label="pager"><span class="page prev"><a href="/foo?page=2"  link-extra
-  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span> <span class="page"><a
-  href="/foo?page=1"  link-extra >1</a></span> <span class="page"><a href="/foo?page=2"  link-extra
-  rel="prev" >2</a></span> <span class="page active">3</span> <span class="page"><a
-  href="/foo?page=4"  link-extra rel="next" >4</a></span> <span class="page"><a href="/foo?page=5"  link-extra
-  >5</a></span> <span class="page"><a href="/foo?page=6"  link-extra >6</a></span>
-  <span class="page next"><a href="/foo?page=4"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
-pagy/frontend::#pagy_nav#test_0003_renders page 6 1: <nav class="pagy-nav pagination"
-  aria-label="pager"><span class="page prev"><a href="/foo?page=5"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
-  <span class="page"><a href="/foo?page=1"   >1</a></span> <span class="page"><a href="/foo?page=2"   >2</a></span>
-  <span class="page"><a href="/foo?page=3"   >3</a></span> <span class="page"><a href="/foo?page=4"   >4</a></span>
-  <span class="page"><a href="/foo?page=5"   rel="prev" >5</a></span> <span class="page
-  active">6</span> <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>
-pagy/frontend::#pagy_nav#test_0003_renders page 6 2: <nav id="test-nav-id" class="pagy-nav
-  pagination" aria-label="pager"><span class="page prev"><a href="/foo?page=5"  link-extra
-  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span> <span class="page"><a
-  href="/foo?page=1"  link-extra >1</a></span> <span class="page"><a href="/foo?page=2"  link-extra
-  >2</a></span> <span class="page"><a href="/foo?page=3"  link-extra >3</a></span>
-  <span class="page"><a href="/foo?page=4"  link-extra >4</a></span> <span class="page"><a
-  href="/foo?page=5"  link-extra rel="prev" >5</a></span> <span class="page active">6</span>
-  <span class="page next disabled">Next&nbsp;&rsaquo;</span></nav>
 pagy/frontend::#pagy_nav#test_0001_renders page 1 1: <nav class="pagy-nav pagination"
   aria-label="pager"><span class="page prev disabled">&lsaquo;&nbsp;Prev</span> <span
   class="page active">1</span> <span class="page"><a href="/foo?page=2"   rel="next"
@@ -66,3 +51,18 @@ pagy/frontend::#pagy_nav#test_0001_renders page 1 2: <nav id="test-nav-id" class
   href="/foo?page=5"  link-extra >5</a></span> <span class="page"><a href="/foo?page=6"  link-extra
   >6</a></span> <span class="page next"><a href="/foo?page=2"  link-extra rel="next"
   aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
+pagy/frontend::#pagy_nav#test_0002_renders page 3 1: <nav class="pagy-nav pagination"
+  aria-label="pager"><span class="page prev"><a href="/foo?page=2"   rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span>
+  <span class="page"><a href="/foo?page=1"   >1</a></span> <span class="page"><a href="/foo?page=2"   rel="prev"
+  >2</a></span> <span class="page active">3</span> <span class="page"><a href="/foo?page=4"   rel="next"
+  >4</a></span> <span class="page"><a href="/foo?page=5"   >5</a></span> <span class="page"><a
+  href="/foo?page=6"   >6</a></span> <span class="page next"><a href="/foo?page=4"   rel="next"
+  aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
+pagy/frontend::#pagy_nav#test_0002_renders page 3 2: <nav id="test-nav-id" class="pagy-nav
+  pagination" aria-label="pager"><span class="page prev"><a href="/foo?page=2"  link-extra
+  rel="prev" aria-label="previous">&lsaquo;&nbsp;Prev</a></span> <span class="page"><a
+  href="/foo?page=1"  link-extra >1</a></span> <span class="page"><a href="/foo?page=2"  link-extra
+  rel="prev" >2</a></span> <span class="page active">3</span> <span class="page"><a
+  href="/foo?page=4"  link-extra rel="next" >4</a></span> <span class="page"><a href="/foo?page=5"  link-extra
+  >5</a></span> <span class="page"><a href="/foo?page=6"  link-extra >6</a></span>
+  <span class="page next"><a href="/foo?page=4"  link-extra rel="next" aria-label="next">Next&nbsp;&rsaquo;</a></span></nav>
diff --git a/test/rematch.rb b/test/rematch.rb
index fd96e6fab..e5f4042c2 100644
--- a/test/rematch.rb
+++ b/test/rematch.rb
@@ -16,15 +16,13 @@
 # You can update the values (or purge the unused values) in a few ways:
 #  * delete the specific store file that you want to update
 #    (e.g. frontend_test.rb.yml) and rerun the test
-#  * set the env variable PAGY_REMATCH = 'true' and rerun all tests
+#  * run the rematch_all task (which will regenerate all the store files)
 #  * manually edit the store file (useful only to try to fail a test)
 
 class Pagy
   class Rematch
     def initialize(path:, base:)
-      file = Pathname.new("#{path}.yml")
-      file.delete if !ENV['PAGY_REMATCH'].nil? && file.file?   # regenerate all the rematch files
-      @store = YAML::Store.new(file.to_s, true)
+      @store = YAML::Store.new("#{path}.yml", true)
       @base  = base
       @count = 0
     end