Bug fix when not using a predefined test set