Cleaning up some spurious event firing in functional test

AFDP-41