Attempt to fix timeout errors in tests