I was looking at this too fearing that my recent changes might have introduced yet another problem (insert rant about windows here) and found that the NPE in testExternalCollectionWatchedNotWatched could be avoided by adding a wait if any of these were null around line 166
FYI. Didn't log which of the above, but I assume the getCollectionRef("c1") returned null. Not pursuing this further, but the NPE is quite reproducible on my machine. I can beast your patch if that'd help, let me know.