Minor rearrangements to HOD_mock class, new additions to test script