added needed libraries
Added the enumerations as independant classes
Updated to use the new enumerations
Fleshed out the EventQuery tests