Fix remaining issues

Use Scheduler, not launcher and BundleManager --test is no more