Fixing some unit tests related to the new Comet usage.
Fixing more unit tests.