Added extra bundles option with functional tests