Tests are timeouting in macosx

@marc.ferras could you look into this please? The tests are timeouting in macosx after I merged your code into master.