Fixes some broken tests
Merge pull request #852 from lukecampbell/test_fixes

Fixes some broken tests