Item13023: Sync up bootstrap tests with core