LPS-46227 Fix test problems caused by SystemEvent changes

cc @juliocamarero @sergiogonzalez