Get tests running
Merge pull request #1 from jgwhite/test-patch

Get tests running. YESSSSS.