Fix bootstrap tests