Updating tests based on the new behavior