Correct the test for functions() to account for the new functions and aliases.
(cherry picked from commit 4ed79d5f778e8e8eb5fa0232545ac719cf4c9d42)