Improved pre-test behaviour