Fixed test to match new function names.