Make default_scope optional - without tests