Merge "Adding unit test to ReorderAlgorithm" into udc-dev