Re-add old commented tests, empty channels for timeouts