Correct some function dependencies to address unresolved symbols in tests.
Merge pull request #2146 from waywardmonkeys/undefined-symbols

Correct some function dependencies to address unresolved symbols in test...