fix delay + timeout test to expect a timeout error
testing timeout error code
Merge commit '2b480bc7789ac563f56589c19041cd07c93bfb9a'

Conflicts:
	tests/test_intercept.js