Improve robustness of pre-init test