chore(bundler): Updated bundler & fixed some tests