Consolidated tests updates