(#6770) Improve test robustness against 'require'

We hit another situation where we crudely flushed the internal set of faces,
but require thought we had already loaded the file defining one. This fooled
our autoloader and raised more annoying problems.

Reviewed-By: Matt Robinson <matt@puppetlabs.com>