Remove one change from Francis to avoid duplicated filtering of end-of-test messages