Updates the tests to use non-bitmask events, event renames, as well as some of the new completion events to improve reliability of the tests.