Item13023: Re-sync tests with core bootstrap