make test less brittle, and hopefully give a better failure message
merge cherry picked fix
Merge pull request #14 from ssayer/bundle_scoping

Fix Bundle scoping test