Fixes bundle and bundle testing