Test fixes
Merge pull request #998 from lukecampbell/qc

Test fixes