fixing tests for the function renames.