Improved pre-test state verification