bootstrap config rolled back, tests improved for bootstrap