Bundle update, unmockify some specs.