Fixing timeout tests.

While working on #1268, I realized that the tests I had in place for #1262 were incorrect.