Merge "Update tests to treat multithreaded_present as true" into main