Fixing intermittent stest failures
Ditto for taps