Add timeout-aware test