Bundling tests finally passing