added waitFor to avoid discovery issue
Fixed and made tests hard