Begin adapting to scopebased configurator + added PrototypeScope to fix broken tests