So my previous self-administered MBTI test was totally wrong! I just returned from training class and took it again and I am definitely not what I thought I was, a INFJ.

Now it makes much more sense that I am an ISTP (Introverted Sensing Thinking Perceiving) type. Although I am not strongly an S, I am very much an I, T, and P which means I am also leaning towards INTP.