Done some more on ContactManagerImplTest...
Realised that I can't add notes to a future meeting without it being in the past, but I also can't add a future meeting not in the future.  Changed relevant tests so the future meeting is added for today, since today is both in the past and the future.  Deep.
Just need to write test for flush...