LPS-36106 split tests

Please review my changes

Thanks!