Merge "Update test for vertical split" into tm-qpr-dev