Added tests for Chose Class Event.  Implemented.  Refactored