Refactor default params for demo modules
Add two modules to auto-submit list