Fix Version/s: None
The following are used:
Replace these with equivalents from std if possible.
Really minor changes only in one test. CI underway but I don't expect any problems and will not merge before it is done.