WIP: Improve robustness of the test suite