Fix a problem loading spork
Fix a warning during bundle
Merge pull request #77 from AndrewLorente/misc-fixes

Assorted minor test fixes