Post testing comments (patch 1)

I finally had a chance to look at the branch, and I found a few things I left out when I was ported to the two 1.4.8 code base.