Added a test that verifies that the old behavior is broken and the new behavior works.
Use assertTrueEventually in the test, as events may be delayed.