AIA-2 moved stream extraction out of test, added tracking of last event