Fix remaining broken tests
Merge pull request #622 from muffinresearch/fix-remaining-broken-tests

Fix remaining broken tests