Update tests to reflect renames