fix tests to support winter-8 changes