Fix bundle extension + add missing test