Some fixes to getting event handlers loaded before a cluster node comes up.. some other small fixes.
A couple small refactorings.
Some experimental changes.
Fixed the CellarGroupsTest to run properly and some other fixes/changes.
Some more fixes to tests and code... 3 tests are still failing.