Simplified test set usage in eval