Small updates to the test set generator