Bundler restructuring and testing convenience