Minor improvements to the bundling tests.