Change TEST-TIMEOUT-MS to be simpler and maybe faster