CoreBundle -> MainBundle
Making tests work