Changed timeout so steps will no longer hang

Adds a test timeout to eliminate the tests that timeout the suite.