Updated with "test set copy" feature. Other classes/methods are updated
to accomadate the adjustment.