Fixed test to reflect new filedispatcher semantics, as well as two
NameErrors pointed out by Giampaolo.
2 files changed