(PE-2405) Move bootstrap tests