refactored some EventDispatcher tests
continued fleshing out some domain models