removed dependency on particular EventBatch inheritance; removed a number of type parameters, fixed unit tests
Merged conflicts