Fix tests to match current (std).