Added EventTypeMaterial and unit tests