WIP: Add test for zero timeout