unit test fix for #3052 and #3053

PS: We have an assertTrueEventually thing in the system that you can use to clean this code up a bit.