OCL: split: update tests and implementation