Fix test suite failure intoduced in #511
Merge pull request #535 from adamlundrigan/hotfix/534

Fix test suite failure intoduced in #511