Break test into 2 parts, still unable to reproduce the timeout locally