Change partition cut functions again
Use new partition_cut functions
Indent test_partition2