Updating tests based on recent changes.