More explicit pre-test conditions