Ensure we handle functor names and resetting correctly.
Fix a few unit tests due to changes.