update tests after renames