Add back timeout on tests. Need this when tests initially fail.
Merge