Fixed broken unit tests, event triggers passing methods instead of variables