Improved debugging
Timeout tests