Added a TODO
Increased the timeout to 1000