Merge "Update split with self test since it didn't account for contextual split" into main