Yeah, guess that's my first stop, before actual therapy. I'm now 99% sure I actually have all of the Cluster C PDs (avoidant, dependent, obsessive-compulsive). I fulfill all 7 of the DSM criteria for avoidant, and most of the dependent as well.
Would make sense too, I was diagnosed with OCPD when I was 17, so I suppose the psych I was seeing then wrote off my other symptoms as teenage angst.

But hey, I do love taking tests. If the ones on this site are anything like the official ones (and many of them do seem to be based on DSM criteria), then I'm pretty confident about what the diagnosis will be. Finally.