Tweaks
Fix scoping issue that caused timeouts in tests
Revert "Bump up the timeout"

This reverts commit 585e2d7a2cfb5158bcce97084a02ee28961fedae.