rm bundlename from core, add tests