Re-arranging min tests