Remove double check on solicited?
Removed duplicated conditional
Make tests more robust to flaky failures