Finished adding support to allow for event-driven vs. time-driven testing.