first attempt to fix timeouts
all local tests passed