FIX proper requires for Bundler / no Bundler in test helper