Test -OneSched improvements