I don't think either one gets close to the cog functions as people share many behaviors and thoughts but the motivations behind them and style are different and this is something that is generally overlooked by mbti. Plus the test format is really limited, one on one sessions are perhaps the superior method of identifying type.
Some ways to fix the test questions could be:
What are your feelings toward organization? In what way are you organized? In what way do you despise others being organized?
For "here and now":
- I actively work towards my future with my eyes set on a clear goal -- energetic and visionary
- I actively work towards my future but I tend to jump to a new thing every once in a while -- energetic but aimless
- I take each day one at a time but I am often day dreaming -- lethargic and spacey
- I take each day one at a time and I make the effort to engage life's demands -- lethargic and pragmatic