I agree; but for now I'd like to adopt rewire in a separate PR, to keep this PR focused on Istanbul integration.  Hand-changing test-bdd.js like this is just a "get the thing working" patch that I'll revert when I'm happy everything else works as I expected.