Fixing intermittent stest failures