latest changes to allow the use of known test set