Merge "Sort tests when using BedsteadJUnit4 and allow state to leak." into sc-dev