Initial work to make matching events tests easier