Support for multiple event datasets; fixed test