I'm not sure. I think it is possible to refactor out bundle creation code, however. This should shorten some of the tests.