Add consistent bootstrap tests for 2434