Fixes test_instrument_simple
Merge pull request #1137 from lukecampbell/fix-test_instrument_simple

Fixes test_instrument_simple