Fixes for more stable tests