[SPARK-3974] Updated tests to reflect changes