Updated MultiSort class and Test Harness