Small fixes to remove errors when running test scripts for optimal split.