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

...s.