unify the bundle role
adjust rake tests