Unit test fixes

Hi Vinay, I tried to push these commits directly back to your branch, but I don't have permission. In any case, you can merge these onto your branch if you like.

I'm going to write the LoaderInterface now, and that will let us return parseResult to protected visibility. After that's done we can finish merging this branch to master.