Fix std tests and add std workaround.Fix std tests and add std
workaround.