Add no-timeout test scripts
Merge branch 'sherlock'