Revert "Revert "Merge pull request #1012 from lukecampbell/qc""

This reverts commit f61b6f581bd5e6c67a3b6308a78316de96e48bc3.
Fixes test_activateInstrumentSample
Merge pull request #1017 from lukecampbell/qc

Fixes smoke with QC test