The "Test" half of the data set now OK

Needs to be merged with the "Train" side.