Correct expected event scopes
Correct incoming event scopes and the track method

We know these are supposed to be two separate commits, but GitX wouldn't have it for some reason.
Correct matcher method