Bump timeout to 2m, and make it configurable.