No more run aways

Adds timeout to tests to try eliminating the run-away tests from timing out the suite.