Tweak to work with the bundle compiler passes
Add more test cases