I Am INFP / ENTP ( both )...and ADHD (edit change)
edit change: I took the test again...one more time as a double blind control. It came up ENTP instead of ENFP. I think this is a better fit all things considered.
INFP in a Nutshell (The Healer )
INFPs are imaginative idealists, guided by their own core values and beliefs. To a Healer, possibilities are paramount; the realism of the moment is only of passing concern. They see potential for a better future, and pursue truth and meaning with their own individual flair.