Fix broken test and splitting logic

Change-Id: Ic37abedbe8e618adc0315c900248a1ef70e4d29f
Merge "Fix broken test and splitting logic"