Refactor the copy/paste logic in the integration tests and fix a race condition involving the waitForEvent integration test helper function

Refactor the copy/paste logic in the integration tests and fix a race condition involving the waitForEvent integration test helper function #1610